From a0b0f5a5d36a01850ceb27fa54655804bbdea548 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 7 Nov 2009 22:00:03 +0000
Subject: [PATCH] --- yaml --- r: 171663 b: refs/heads/master c:
 a974a4bbcb1ceddc9c89defd7dab4da4b2b53d77 h: refs/heads/master i:   171661:
 46e60fdc5802b9964b976a344584402ea1f3e23a   171659:
 cd267b52ed506682d3d1fb6c0687aea9f604cbcf   171655:
 89f53fce2d2fbd8bbc7ab1af5b40044db39a88ec   171647:
 7a3f93d764b4bc01a58ae2eda40f633989818c8e v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/libertas/if_cs.c   | 1 +
 trunk/drivers/net/wireless/libertas/if_sdio.c | 6 ++++++
 trunk/drivers/net/wireless/libertas/if_spi.c  | 4 ++++
 trunk/drivers/net/wireless/libertas/if_usb.c  | 2 ++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 08d2ae3ffd00..5cde3b86c3f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 328aca32783cc98088151ce905977c8e899e5fc9
+refs/heads/master: a974a4bbcb1ceddc9c89defd7dab4da4b2b53d77
diff --git a/trunk/drivers/net/wireless/libertas/if_cs.c b/trunk/drivers/net/wireless/libertas/if_cs.c
index 465742f19ecb..875516db319c 100644
--- a/trunk/drivers/net/wireless/libertas/if_cs.c
+++ b/trunk/drivers/net/wireless/libertas/if_cs.c
@@ -48,6 +48,7 @@
 MODULE_AUTHOR("Holger Schurig <hs4233@mail.mn-solutions.de>");
 MODULE_DESCRIPTION("Driver for Marvell 83xx compact flash WLAN cards");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("libertas_cs_helper.fw");
 
 
 
diff --git a/trunk/drivers/net/wireless/libertas/if_sdio.c b/trunk/drivers/net/wireless/libertas/if_sdio.c
index 9716728a33cb..09fcfad742e7 100644
--- a/trunk/drivers/net/wireless/libertas/if_sdio.c
+++ b/trunk/drivers/net/wireless/libertas/if_sdio.c
@@ -99,6 +99,12 @@ static struct if_sdio_model if_sdio_models[] = {
 		.firmware = "sd8688.bin",
 	},
 };
+MODULE_FIRMWARE("sd8385_helper.bin");
+MODULE_FIRMWARE("sd8385.bin");
+MODULE_FIRMWARE("sd8686_helper.bin");
+MODULE_FIRMWARE("sd8686.bin");
+MODULE_FIRMWARE("sd8688_helper.bin");
+MODULE_FIRMWARE("sd8688.bin");
 
 struct if_sdio_packet {
 	struct if_sdio_packet	*next;
diff --git a/trunk/drivers/net/wireless/libertas/if_spi.c b/trunk/drivers/net/wireless/libertas/if_spi.c
index d6a48dd3652c..bf4bfbae6227 100644
--- a/trunk/drivers/net/wireless/libertas/if_spi.c
+++ b/trunk/drivers/net/wireless/libertas/if_spi.c
@@ -902,6 +902,10 @@ static int if_spi_calculate_fw_names(u16 card_id,
 		 chip_id_to_device_name[i].name);
 	return 0;
 }
+MODULE_FIRMWARE("libertas/gspi8385_hlp.bin");
+MODULE_FIRMWARE("libertas/gspi8385.bin");
+MODULE_FIRMWARE("libertas/gspi8686_hlp.bin");
+MODULE_FIRMWARE("libertas/gspi8686.bin");
 
 static int __devinit if_spi_probe(struct spi_device *spi)
 {
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
index f12d667ba100..65e174595d12 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.c
+++ b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -28,6 +28,8 @@
 static char *lbs_fw_name = "usb8388.bin";
 module_param_named(fw_name, lbs_fw_name, charp, 0644);
 
+MODULE_FIRMWARE("usb8388.bin");
+
 static struct usb_device_id if_usb_table[] = {
 	/* Enter the device signature inside */
 	{ USB_DEVICE(0x1286, 0x2001) },