diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-01-12 07:47:22 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-12 14:21:07 -0500 |
commit | c92d4edecf489dbcbb2e5dd3c513790e57e2ea0e (patch) | |
tree | fd4c13f6806650edea5ab12c6662c58ba41d4e22 /drivers/net/wireless/mwl8k.c | |
parent | 4ff6ffa107ba1c6ba9a1cc75a1f304eaa79e8bf4 (diff) |
mwl8k: update MODULE_FIRMWARE tags
Add MODULE_FIRMWARE tags for the mwl8k firmware images that don't
have them yet, and move them to where the firmware image names are
declared.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 13b0e32b051a..01cababfefa8 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -394,9 +394,6 @@ static int mwl8k_request_firmware(struct mwl8k_priv *priv) | |||
394 | return 0; | 394 | return 0; |
395 | } | 395 | } |
396 | 396 | ||
397 | MODULE_FIRMWARE("mwl8k/helper_8687.fw"); | ||
398 | MODULE_FIRMWARE("mwl8k/fmimage_8687.fw"); | ||
399 | |||
400 | struct mwl8k_cmd_pkt { | 397 | struct mwl8k_cmd_pkt { |
401 | __le16 code; | 398 | __le16 code; |
402 | __le16 length; | 399 | __le16 length; |
@@ -3737,6 +3734,13 @@ static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = { | |||
3737 | }, | 3734 | }, |
3738 | }; | 3735 | }; |
3739 | 3736 | ||
3737 | MODULE_FIRMWARE("mwl8k/helper_8363.fw"); | ||
3738 | MODULE_FIRMWARE("mwl8k/fmimage_8363.fw"); | ||
3739 | MODULE_FIRMWARE("mwl8k/helper_8687.fw"); | ||
3740 | MODULE_FIRMWARE("mwl8k/fmimage_8687.fw"); | ||
3741 | MODULE_FIRMWARE("mwl8k/helper_8366.fw"); | ||
3742 | MODULE_FIRMWARE("mwl8k/fmimage_8366.fw"); | ||
3743 | |||
3740 | static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = { | 3744 | static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = { |
3741 | { PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, }, | 3745 | { PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, }, |
3742 | { PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, }, | 3746 | { PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, }, |