summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-01-12 13:47:22 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-01-12 14:21:07 -0500
commitc92d4edecf489dbcbb2e5dd3c513790e57e2ea0e (patch)
treefd4c13f6806650edea5ab12c6662c58ba41d4e22
parent4ff6ffa107ba1c6ba9a1cc75a1f304eaa79e8bf4 (diff)
downloadlinux-c92d4edecf489dbcbb2e5dd3c513790e57e2ea0e.tar.gz
linux-c92d4edecf489dbcbb2e5dd3c513790e57e2ea0e.tar.bz2
linux-c92d4edecf489dbcbb2e5dd3c513790e57e2ea0e.zip
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>
-rw-r--r--drivers/net/wireless/mwl8k.c10
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)
return 0;
}
-MODULE_FIRMWARE("mwl8k/helper_8687.fw");
-MODULE_FIRMWARE("mwl8k/fmimage_8687.fw");
-
struct mwl8k_cmd_pkt {
__le16 code;
__le16 length;
@@ -3737,6 +3734,13 @@ static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = {
},
};
+MODULE_FIRMWARE("mwl8k/helper_8363.fw");
+MODULE_FIRMWARE("mwl8k/fmimage_8363.fw");
+MODULE_FIRMWARE("mwl8k/helper_8687.fw");
+MODULE_FIRMWARE("mwl8k/fmimage_8687.fw");
+MODULE_FIRMWARE("mwl8k/helper_8366.fw");
+MODULE_FIRMWARE("mwl8k/fmimage_8366.fw");
+
static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
{ PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, },
{ PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, },