aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54pci.c
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@web.de>2008-10-18 17:04:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-11-10 15:10:15 -0500
commit9a8675d712d57da0993ad2e43b168c9585892097 (patch)
tree9f7bc455c1acfcc0efce0b8092c93759d88814ce /drivers/net/wireless/p54/p54pci.c
parent4ceb7b6ae2cf5b6e32c403a11bb54081bf8f8b83 (diff)
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.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 3c9d030ccb8d..c4a868ae6d6b 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>");
28MODULE_DESCRIPTION("Prism54 PCI wireless driver"); 28MODULE_DESCRIPTION("Prism54 PCI wireless driver");
29MODULE_LICENSE("GPL"); 29MODULE_LICENSE("GPL");
30MODULE_ALIAS("prism54pci"); 30MODULE_ALIAS("prism54pci");
31MODULE_FIRMWARE("isl3886pci");
31 32
32static struct pci_device_id p54p_table[] __devinitdata = { 33static struct pci_device_id p54p_table[] __devinitdata = {
33 /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */ 34 /* Intersil PRISM Duette/Prism GT Wireless LAN adapter */
@@ -72,11 +73,13 @@ static int p54p_upload_firmware(struct ieee80211_hw *dev)
72 P54P_WRITE(ctrl_stat, reg); 73 P54P_WRITE(ctrl_stat, reg);
73 wmb(); 74 wmb();
74 75
75 err = request_firmware(&fw_entry, "isl3886", &priv->pdev->dev); 76 err = request_firmware(&fw_entry, "isl3886pci", &priv->pdev->dev);
76 if (err) { 77 if (err) {
77 printk(KERN_ERR "%s (p54pci): cannot find firmware " 78 printk(KERN_ERR "%s (p54pci): cannot find firmware "
78 "(isl3886)\n", pci_name(priv->pdev)); 79 "(isl3886pci)\n", pci_name(priv->pdev));
79 return err; 80 err = request_firmware(&fw_entry, "isl3886", &priv->pdev->dev);
81 if (err)
82 return err;
80 } 83 }
81 84
82 err = p54_parse_firmware(dev, fw_entry); 85 err = p54_parse_firmware(dev, fw_entry);