diff options
| author | Christian Lamparter <chunkeey@web.de> | 2008-10-18 23:04:15 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-10 15:10:15 -0500 |
| commit | 9a8675d712d57da0993ad2e43b168c9585892097 (patch) | |
| tree | 9f7bc455c1acfcc0efce0b8092c93759d88814ce /drivers/net/wireless/p54/p54pci.c | |
| parent | 4ceb7b6ae2cf5b6e32c403a11bb54081bf8f8b83 (diff) | |
| download | kernel_samsung_smdk4412-9a8675d712d57da0993ad2e43b168c9585892097.zip kernel_samsung_smdk4412-9a8675d712d57da0993ad2e43b168c9585892097.tar.gz kernel_samsung_smdk4412-9a8675d712d57da0993ad2e43b168c9585892097.tar.bz2 | |
p54: introduce new names for device firmwares
Johannes thought it would have been a good idea to change the firmware names.
Note: we still have fallbacks in case our users don't want to "break their running system",
but we won't advertise them with MODULE_FIRMWARE.
Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.c')
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index 3c9d030..c4a868a 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c @@ -28,6 +28,7 @@ MODULE_AUTHOR("Michael Wu <flamingice@sourmilk.net>"); MODULE_DESCRIPTION("Prism54 PCI wireless driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("prism54pci"); +MODULE_FIRMWARE("isl3886pci"); static struct pci_device_id p54p_table[] __devinitdata = { /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ @@ -72,11 +73,13 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev) P54P_WRITE(ctrl_stat, reg); wmb(); - err = request_firmware(&fw_entry, "isl3886", &priv->pdev->dev); + err = request_firmware(&fw_entry, "isl3886pci", &priv->pdev->dev); if (err) { printk(KERN_ERR "%s (p54pci): cannot find firmware " - "(isl3886)\n", pci_name(priv->pdev)); - return err; + "(isl3886pci)\n", pci_name(priv->pdev)); + err = request_firmware(&fw_entry, "isl3886", &priv->pdev->dev); + if (err) + return err; } err = p54_parse_firmware(dev, fw_entry); |