diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2009-11-07 17:00:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-11 15:23:53 -0500 |
commit | a974a4bbcb1ceddc9c89defd7dab4da4b2b53d77 (patch) | |
tree | 6aed218a0db8d3e15731cc17ddeb200eff5c3d88 /drivers/net/wireless | |
parent | 328aca32783cc98088151ce905977c8e899e5fc9 (diff) |
libertas: declare MODULE_FIRMWARE
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_spi.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 2 |
4 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 465742f19ecb..875516db319c 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -48,6 +48,7 @@ | |||
48 | MODULE_AUTHOR("Holger Schurig <hs4233@mail.mn-solutions.de>"); | 48 | MODULE_AUTHOR("Holger Schurig <hs4233@mail.mn-solutions.de>"); |
49 | MODULE_DESCRIPTION("Driver for Marvell 83xx compact flash WLAN cards"); | 49 | MODULE_DESCRIPTION("Driver for Marvell 83xx compact flash WLAN cards"); |
50 | MODULE_LICENSE("GPL"); | 50 | MODULE_LICENSE("GPL"); |
51 | MODULE_FIRMWARE("libertas_cs_helper.fw"); | ||
51 | 52 | ||
52 | 53 | ||
53 | 54 | ||
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 9716728a33cb..09fcfad742e7 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
@@ -99,6 +99,12 @@ static struct if_sdio_model if_sdio_models[] = { | |||
99 | .firmware = "sd8688.bin", | 99 | .firmware = "sd8688.bin", |
100 | }, | 100 | }, |
101 | }; | 101 | }; |
102 | MODULE_FIRMWARE("sd8385_helper.bin"); | ||
103 | MODULE_FIRMWARE("sd8385.bin"); | ||
104 | MODULE_FIRMWARE("sd8686_helper.bin"); | ||
105 | MODULE_FIRMWARE("sd8686.bin"); | ||
106 | MODULE_FIRMWARE("sd8688_helper.bin"); | ||
107 | MODULE_FIRMWARE("sd8688.bin"); | ||
102 | 108 | ||
103 | struct if_sdio_packet { | 109 | struct if_sdio_packet { |
104 | struct if_sdio_packet *next; | 110 | struct if_sdio_packet *next; |
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index d6a48dd3652c..bf4bfbae6227 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c | |||
@@ -902,6 +902,10 @@ static int if_spi_calculate_fw_names(u16 card_id, | |||
902 | chip_id_to_device_name[i].name); | 902 | chip_id_to_device_name[i].name); |
903 | return 0; | 903 | return 0; |
904 | } | 904 | } |
905 | MODULE_FIRMWARE("libertas/gspi8385_hlp.bin"); | ||
906 | MODULE_FIRMWARE("libertas/gspi8385.bin"); | ||
907 | MODULE_FIRMWARE("libertas/gspi8686_hlp.bin"); | ||
908 | MODULE_FIRMWARE("libertas/gspi8686.bin"); | ||
905 | 909 | ||
906 | static int __devinit if_spi_probe(struct spi_device *spi) | 910 | static int __devinit if_spi_probe(struct spi_device *spi) |
907 | { | 911 | { |
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index f12d667ba100..65e174595d12 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
@@ -28,6 +28,8 @@ | |||
28 | static char *lbs_fw_name = "usb8388.bin"; | 28 | static char *lbs_fw_name = "usb8388.bin"; |
29 | module_param_named(fw_name, lbs_fw_name, charp, 0644); | 29 | module_param_named(fw_name, lbs_fw_name, charp, 0644); |
30 | 30 | ||
31 | MODULE_FIRMWARE("usb8388.bin"); | ||
32 | |||
31 | static struct usb_device_id if_usb_table[] = { | 33 | static struct usb_device_id if_usb_table[] = { |
32 | /* Enter the device signature inside */ | 34 | /* Enter the device signature inside */ |
33 | { USB_DEVICE(0x1286, 0x2001) }, | 35 | { USB_DEVICE(0x1286, 0x2001) }, |