[kernel] r14720 - in dists/trunk/linux-2.6/debian: . patches/features/all/module-firmware patches/series
Ben Hutchings
benh at alioth.debian.org
Thu Dec 3 23:38:43 UTC 2009
Author: benh
Date: Thu Dec 3 23:38:41 2009
New Revision: 14720
Log:
Add MODULE_FIRMWARE declarations to many drivers that lacked them
so that missing firmware will be reported automatically during upgrades
Added:
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0001-netxen-module-firmware-hints.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0002-netx-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0003-solos-pci-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0004-ambassador-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0005-bnx2x-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0006-cxgb3-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0007-myri10ge-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0008-spider-net-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0009-tms380tr-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0010-pcnet-cs-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0011-speedfax-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0012-at76c50x-usb-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0013-atmel-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0014-ipw2100-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0015-ipw2200-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0016-iwmc3200wifi-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0017-libertas-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0018-libertas_tf_usb-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0019-mwl8k-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0020-orinoco-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0021-prism54-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0022-wl12xx-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0023-zd1201-declare-MODULE_FIRMWARE.patch
dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0024-zd1211rw-declare-MODULE_FIRMWARE.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Thu Dec 3 11:20:21 2009 (r14719)
+++ dists/trunk/linux-2.6/debian/changelog Thu Dec 3 23:38:41 2009 (r14720)
@@ -28,6 +28,8 @@
* Add 'removable' option to the mmc module. Setting this to 0 causes
MMC/SD cards to be assumed non-removable, and filesystems on them
will remain mounted over a suspend/resume cycle. (Closes: #504391)
+ * Add MODULE_FIRMWARE declarations to many drivers that lacked them, so
+ that missing firmware will be reported automatically during upgrades
[ dann frazier ]
* mac80211 (CVE-2009-4026, CVE-2009-4027):
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0001-netxen-module-firmware-hints.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0001-netxen-module-firmware-hints.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,48 @@
+Based on:
+
+From: Dhananjay Phadke <dhananjay at netxen.com>
+Subject: [PATCH 01/24] netxen: module firmware hints
+
+Add MODULE_FIRMWARE hints for various firmware file types,
+required by different chip revisions.
+
+--- a/drivers/net/netxen/netxen_nic.h
++++ b/drivers/net/netxen/netxen_nic.h
+@@ -517,6 +517,11 @@ struct uni_data_desc{
+ #define NX_P3_MN_ROMIMAGE 2
+ #define NX_FLASH_ROMIMAGE 3
+
++#define NX_P2_MN_ROMIMAGE_NAME "nxromimg.bin"
++#define NX_P3_CT_ROMIMAGE_NAME "nx3fwct.bin"
++#define NX_P3_MN_ROMIMAGE_NAME "nx3fwmn.bin"
++#define NX_FLASH_ROMIMAGE_NAME "flash"
++
+ extern char netxen_nic_driver_name[];
+
+ /* Number of status descriptors to handle per interrupt */
+--- a/drivers/net/netxen/netxen_nic_init.c
++++ b/drivers/net/netxen/netxen_nic_init.c
+@@ -822,7 +822,10 @@ netxen_need_fw_reset(struct netxen_adapter *adapter)
+ }
+
+ static char *fw_name[] = {
+- "nxromimg.bin", "nx3fwct.bin", "nx3fwmn.bin", "flash",
++ NX_P2_MN_ROMIMAGE_NAME,
++ NX_P3_CT_ROMIMAGE_NAME,
++ NX_P3_MN_ROMIMAGE_NAME,
++ NX_FLASH_ROMIMAGE_NAME,
+ };
+
+ int
+--- a/drivers/net/netxen/netxen_nic_main.c
++++ b/drivers/net/netxen/netxen_nic_main.c
+@@ -39,6 +39,9 @@
+ MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
++MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
++MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
++MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
+
+ char netxen_nic_driver_name[] = "netxen_nic";
+ static char netxen_nic_driver_string[] = "QLogic/NetXen Network Driver v"
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0002-netx-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0002-netx-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,26 @@
+From 36c04a61f516742dad6f9bad8c6c1a7137a260f5 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:37:36 +0000
+Subject: [PATCH 02/24] netx: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Acked-by: Sascha Hauer <s.hauer at pengutronix.de>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/netx-eth.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c
+index 9f42354..a0d65f5 100644
+--- a/drivers/net/netx-eth.c
++++ b/drivers/net/netx-eth.c
+@@ -510,3 +510,6 @@ module_exit(netx_eth_cleanup);
+ MODULE_AUTHOR("Sascha Hauer, Pengutronix");
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("platform:" CARDNAME);
++MODULE_FIRMWARE("xc0.bin");
++MODULE_FIRMWARE("xc1.bin");
++MODULE_FIRMWARE("xc2.bin");
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0003-solos-pci-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0003-solos-pci-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,28 @@
+From 9fca79d67031203ab1c3b59807aec261d7bb5539 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:40:32 +0000
+Subject: [PATCH 03/24] solos-pci: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/atm/solos-pci.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
+index c5f5186..d7ad19d 100644
+--- a/drivers/atm/solos-pci.c
++++ b/drivers/atm/solos-pci.c
+@@ -142,6 +142,9 @@ MODULE_AUTHOR("Traverse Technologies <support at traverse.com.au>");
+ MODULE_DESCRIPTION("Solos PCI driver");
+ MODULE_VERSION(VERSION);
+ MODULE_LICENSE("GPL");
++MODULE_FIRMWARE("solos-FPGA.bin");
++MODULE_FIRMWARE("solos-Firmware.bin");
++MODULE_FIRMWARE("solos-db-FPGA.bin");
+ MODULE_PARM_DESC(reset, "Reset Solos chips on startup");
+ MODULE_PARM_DESC(atmdebug, "Print ATM data");
+ MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0004-ambassador-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0004-ambassador-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,26 @@
+From e8c0ae2c04372248f2f6940a5984f5748aae9664 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:46:07 +0000
+Subject: [PATCH 04/24] ambassador: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/atm/ambassador.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
+index 66e1813..8af2341 100644
+--- a/drivers/atm/ambassador.c
++++ b/drivers/atm/ambassador.c
+@@ -2351,6 +2351,7 @@ static void __init amb_check_args (void) {
+ MODULE_AUTHOR(maintainer_string);
+ MODULE_DESCRIPTION(description_string);
+ MODULE_LICENSE("GPL");
++MODULE_FIRMWARE("atmsar11.fw");
+ module_param(debug, ushort, 0644);
+ module_param(cmds, uint, 0);
+ module_param(txs, uint, 0);
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0005-bnx2x-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0005-bnx2x-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,81 @@
+From 45229b420f90bb6736dfeb7e491eb46cb02a3e9c Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:53:39 +0000
+Subject: [PATCH 05/24] bnx2x: declare MODULE_FIRMWARE
+
+Replace run-time string formatting with preprocessor string
+manipulation.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Acked-by: Eilon Greenstein <eilong at broadcom.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/bnx2x_main.c | 27 ++++++++++++++-------------
+ 1 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
+index 61974b7..5b6c68a 100644
+--- a/drivers/net/bnx2x_main.c
++++ b/drivers/net/bnx2x_main.c
+@@ -49,6 +49,7 @@
+ #include <linux/prefetch.h>
+ #include <linux/zlib.h>
+ #include <linux/io.h>
++#include <linux/stringify.h>
+
+
+ #include "bnx2x.h"
+@@ -63,8 +64,13 @@
+ #include <linux/firmware.h>
+ #include "bnx2x_fw_file_hdr.h"
+ /* FW files */
+-#define FW_FILE_PREFIX_E1 "bnx2x-e1-"
+-#define FW_FILE_PREFIX_E1H "bnx2x-e1h-"
++#define FW_FILE_VERSION \
++ __stringify(BCM_5710_FW_MAJOR_VERSION) "." \
++ __stringify(BCM_5710_FW_MINOR_VERSION) "." \
++ __stringify(BCM_5710_FW_REVISION_VERSION) "." \
++ __stringify(BCM_5710_FW_ENGINEERING_VERSION)
++#define FW_FILE_NAME_E1 "bnx2x-e1-" FW_FILE_VERSION ".fw"
++#define FW_FILE_NAME_E1H "bnx2x-e1h-" FW_FILE_VERSION ".fw"
+
+ /* Time in jiffies before concluding the transmitter is hung */
+ #define TX_TIMEOUT (5*HZ)
+@@ -77,6 +83,8 @@ MODULE_AUTHOR("Eliezer Tamir");
+ MODULE_DESCRIPTION("Broadcom NetXtreme II BCM57710/57711/57711E Driver");
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION(DRV_MODULE_VERSION);
++MODULE_FIRMWARE(FW_FILE_NAME_E1);
++MODULE_FIRMWARE(FW_FILE_NAME_E1H);
+
+ static int multi_mode = 1;
+ module_param(multi_mode, int, 0);
+@@ -12111,21 +12119,14 @@ static inline void be16_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
+
+ static int __devinit bnx2x_init_firmware(struct bnx2x *bp, struct device *dev)
+ {
+- char fw_file_name[40] = {0};
++ const char *fw_file_name;
+ struct bnx2x_fw_file_hdr *fw_hdr;
+- int rc, offset;
++ int rc;
+
+- /* Create a FW file name */
+ if (CHIP_IS_E1(bp))
+- offset = sprintf(fw_file_name, FW_FILE_PREFIX_E1);
++ fw_file_name = FW_FILE_NAME_E1;
+ else
+- offset = sprintf(fw_file_name, FW_FILE_PREFIX_E1H);
+-
+- sprintf(fw_file_name + offset, "%d.%d.%d.%d.fw",
+- BCM_5710_FW_MAJOR_VERSION,
+- BCM_5710_FW_MINOR_VERSION,
+- BCM_5710_FW_REVISION_VERSION,
+- BCM_5710_FW_ENGINEERING_VERSION);
++ fw_file_name = FW_FILE_NAME_E1H;
+
+ printk(KERN_INFO PFX "Loading %s\n", fw_file_name);
+
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0006-cxgb3-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0006-cxgb3-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,103 @@
+From 34336ec032878d1a32e7df881f16ce2145e53f83 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:53:52 +0000
+Subject: [PATCH 06/24] cxgb3: declare MODULE_FIRMWARE
+
+Replace run-time string formatting with preprocessor string
+manipulation.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Acked-by: Divy Le Ray <divy at chelsio.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/cxgb3/common.h | 8 +++-----
+ drivers/net/cxgb3/cxgb3_main.c | 25 ++++++++++++++++---------
+ 2 files changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
+index 1b2c305..6ff356d 100644
+--- a/drivers/net/cxgb3/common.h
++++ b/drivers/net/cxgb3/common.h
+@@ -125,11 +125,9 @@ enum { /* adapter interrupt-maintained statistics */
+ IRQ_NUM_STATS /* keep last */
+ };
+
+-enum {
+- TP_VERSION_MAJOR = 1,
+- TP_VERSION_MINOR = 1,
+- TP_VERSION_MICRO = 0
+-};
++#define TP_VERSION_MAJOR 1
++#define TP_VERSION_MINOR 1
++#define TP_VERSION_MICRO 0
+
+ #define S_TP_VERSION_MAJOR 16
+ #define M_TP_VERSION_MAJOR 0xFF
+diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
+index c9113d3..b1a5a00 100644
+--- a/drivers/net/cxgb3/cxgb3_main.c
++++ b/drivers/net/cxgb3/cxgb3_main.c
+@@ -44,6 +44,7 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/firmware.h>
+ #include <linux/log2.h>
++#include <linux/stringify.h>
+ #include <asm/uaccess.h>
+
+ #include "common.h"
+@@ -992,11 +993,21 @@ static int bind_qsets(struct adapter *adap)
+ return err;
+ }
+
+-#define FW_FNAME "cxgb3/t3fw-%d.%d.%d.bin"
+-#define TPSRAM_NAME "cxgb3/t3%c_psram-%d.%d.%d.bin"
++#define FW_VERSION __stringify(FW_VERSION_MAJOR) "." \
++ __stringify(FW_VERSION_MINOR) "." __stringify(FW_VERSION_MICRO)
++#define FW_FNAME "cxgb3/t3fw-" FW_VERSION ".bin"
++#define TPSRAM_VERSION __stringify(TP_VERSION_MAJOR) "." \
++ __stringify(TP_VERSION_MINOR) "." __stringify(TP_VERSION_MICRO)
++#define TPSRAM_NAME "cxgb3/t3%c_psram-" TPSRAM_VERSION ".bin"
+ #define AEL2005_OPT_EDC_NAME "cxgb3/ael2005_opt_edc.bin"
+ #define AEL2005_TWX_EDC_NAME "cxgb3/ael2005_twx_edc.bin"
+ #define AEL2020_TWX_EDC_NAME "cxgb3/ael2020_twx_edc.bin"
++MODULE_FIRMWARE(FW_FNAME);
++MODULE_FIRMWARE("cxgb3/t3b_psram-" TPSRAM_VERSION ".bin");
++MODULE_FIRMWARE("cxgb3/t3c_psram-" TPSRAM_VERSION ".bin");
++MODULE_FIRMWARE(AEL2005_OPT_EDC_NAME);
++MODULE_FIRMWARE(AEL2005_TWX_EDC_NAME);
++MODULE_FIRMWARE(AEL2020_TWX_EDC_NAME);
+
+ static inline const char *get_edc_fw_name(int edc_idx)
+ {
+@@ -1067,16 +1078,13 @@ int t3_get_edc_fw(struct cphy *phy, int edc_idx, int size)
+ static int upgrade_fw(struct adapter *adap)
+ {
+ int ret;
+- char buf[64];
+ const struct firmware *fw;
+ struct device *dev = &adap->pdev->dev;
+
+- snprintf(buf, sizeof(buf), FW_FNAME, FW_VERSION_MAJOR,
+- FW_VERSION_MINOR, FW_VERSION_MICRO);
+- ret = request_firmware(&fw, buf, dev);
++ ret = request_firmware(&fw, FW_FNAME, dev);
+ if (ret < 0) {
+ dev_err(dev, "could not upgrade firmware: unable to load %s\n",
+- buf);
++ FW_FNAME);
+ return ret;
+ }
+ ret = t3_load_fw(adap, fw->data, fw->size);
+@@ -1120,8 +1128,7 @@ static int update_tpsram(struct adapter *adap)
+ if (!rev)
+ return 0;
+
+- snprintf(buf, sizeof(buf), TPSRAM_NAME, rev,
+- TP_VERSION_MAJOR, TP_VERSION_MINOR, TP_VERSION_MICRO);
++ snprintf(buf, sizeof(buf), TPSRAM_NAME, rev);
+
+ ret = request_firmware(&tpsram, buf, dev);
+ if (ret < 0) {
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0007-myri10ge-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0007-myri10ge-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,29 @@
+From b9721d5a2fa00ad979c19a9511d43d2664d5381c Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:54:44 +0000
+Subject: [PATCH 07/24] myri10ge: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/myri10ge/myri10ge.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
+index 5319db9..85e1b6a 100644
+--- a/drivers/net/myri10ge/myri10ge.c
++++ b/drivers/net/myri10ge/myri10ge.c
+@@ -263,6 +263,10 @@ static char *myri10ge_fw_unaligned = "myri10ge_ethp_z8e.dat";
+ static char *myri10ge_fw_aligned = "myri10ge_eth_z8e.dat";
+ static char *myri10ge_fw_rss_unaligned = "myri10ge_rss_ethp_z8e.dat";
+ static char *myri10ge_fw_rss_aligned = "myri10ge_rss_eth_z8e.dat";
++MODULE_FIRMWARE("myri10ge_ethp_z8e.dat");
++MODULE_FIRMWARE("myri10ge_eth_z8e.dat");
++MODULE_FIRMWARE("myri10ge_rss_ethp_z8e.dat");
++MODULE_FIRMWARE("myri10ge_rss_eth_z8e.dat");
+
+ static char *myri10ge_fw_name = NULL;
+ module_param(myri10ge_fw_name, charp, S_IRUGO | S_IWUSR);
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0008-spider-net-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0008-spider-net-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,26 @@
+From 866691a21e8c9dfc58c5ab1ed77d5c41e779755b Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:55:07 +0000
+Subject: [PATCH 08/24] spider-net: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/spider_net.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
+index 90e663f..782910c 100644
+--- a/drivers/net/spider_net.c
++++ b/drivers/net/spider_net.c
+@@ -57,6 +57,7 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher at de.ibm.com> and Jens Osterkamp " \
+ MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver");
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION(VERSION);
++MODULE_FIRMWARE(SPIDER_NET_FIRMWARE_NAME);
+
+ static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT;
+ static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT;
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0009-tms380tr-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0009-tms380tr-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,27 @@
+From b3ccbb24e8914973be0d2ee7b66e44cecaed9bf5 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 11:55:20 +0000
+Subject: [PATCH 09/24] tms380tr: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/tokenring/tms380tr.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
+index a7b6888..fa15214 100644
+--- a/drivers/net/tokenring/tms380tr.c
++++ b/drivers/net/tokenring/tms380tr.c
+@@ -1364,6 +1364,8 @@ static int tms380tr_reset_adapter(struct net_device *dev)
+ return (-1);
+ }
+
++MODULE_FIRMWARE("tms380tr.bin");
++
+ /*
+ * Starts bring up diagnostics of token ring adapter and evaluates
+ * diagnostic results.
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0010-pcnet-cs-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0010-pcnet-cs-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,32 @@
+From 8489992e723b5def1a807e615854f51b75d10600 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 12:04:09 +0000
+Subject: [PATCH 10/24] pcnet-cs: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/pcmcia/pcnet_cs.c | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
+index 94c9ad2..4696844 100644
+--- a/drivers/net/pcmcia/pcnet_cs.c
++++ b/drivers/net/pcmcia/pcnet_cs.c
+@@ -1768,6 +1768,13 @@ static struct pcmcia_device_id pcnet_ids[] = {
+ PCMCIA_DEVICE_NULL
+ };
+ MODULE_DEVICE_TABLE(pcmcia, pcnet_ids);
++MODULE_FIRMWARE("cis/PCMLM28.cis");
++MODULE_FIRMWARE("cis/DP83903.cis");
++MODULE_FIRMWARE("cis/LA-PCM.cis");
++MODULE_FIRMWARE("PE520.cis");
++MODULE_FIRMWARE("cis/NE2K.cis");
++MODULE_FIRMWARE("cis/PE-200.cis");
++MODULE_FIRMWARE("cis/tamarack.cis");
+
+ static struct pcmcia_driver pcnet_driver = {
+ .drv = {
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0011-speedfax-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0011-speedfax-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,26 @@
+From 4a9b5e5053a184ada2e9b19aee12b6200bb8980f Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 10 Nov 2009 20:30:37 -0800
+Subject: [PATCH 11/24] speedfax: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/isdn/hardware/mISDN/speedfax.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c
+index ff3a4e2..7726afd 100644
+--- a/drivers/isdn/hardware/mISDN/speedfax.c
++++ b/drivers/isdn/hardware/mISDN/speedfax.c
+@@ -110,6 +110,7 @@ set_debug(const char *val, struct kernel_param *kp)
+ MODULE_AUTHOR("Karsten Keil");
+ MODULE_LICENSE("GPL v2");
+ MODULE_VERSION(SPEEDFAX_REV);
++MODULE_FIRMWARE("isdn/ISAR.BIN");
+ module_param_call(debug, set_debug, param_get_uint, &debug, S_IRUGO | S_IWUSR);
+ MODULE_PARM_DESC(debug, "Speedfax debug mask");
+ module_param(irqloops, uint, S_IRUGO | S_IWUSR);
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0012-at76c50x-usb-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0012-at76c50x-usb-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,33 @@
+From 202982dbf51ece7c2b49dc8b6066ff60cb02bcce Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 21:56:08 +0000
+Subject: [PATCH 12/24] at76c50x-usb: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/at76c50x-usb.c | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
+index e559dc9..0a917e4 100644
+--- a/drivers/net/wireless/at76c50x-usb.c
++++ b/drivers/net/wireless/at76c50x-usb.c
+@@ -121,6 +121,14 @@ static struct fwentry firmwares[] = {
+ [BOARD_505A] = { "atmel_at76c505a-rfmd2958.bin" },
+ [BOARD_505AMX] = { "atmel_at76c505amx-rfmd.bin" },
+ };
++MODULE_FIRMWARE("atmel_at76c503-i3861.bin");
++MODULE_FIRMWARE("atmel_at76c503-i3863.bin");
++MODULE_FIRMWARE("atmel_at76c503-rfmd.bin");
++MODULE_FIRMWARE("atmel_at76c503-rfmd-acc.bin");
++MODULE_FIRMWARE("atmel_at76c505-rfmd.bin");
++MODULE_FIRMWARE("atmel_at76c505-rfmd2958.bin");
++MODULE_FIRMWARE("atmel_at76c505a-rfmd2958.bin");
++MODULE_FIRMWARE("atmel_at76c505amx-rfmd.bin");
+
+ #define USB_DEVICE_DATA(__ops) .driver_info = (kernel_ulong_t)(__ops)
+
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0013-atmel-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0013-atmel-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,41 @@
+From b98a032f6d9d4a5bc17490f67b13e5ca77c8410f Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 21:58:05 +0000
+Subject: [PATCH 13/24] atmel: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/atmel.c | 16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
+index cce1888..3edbbcf 100644
+--- a/drivers/net/wireless/atmel.c
++++ b/drivers/net/wireless/atmel.c
+@@ -99,6 +99,22 @@ static struct {
+ { ATMEL_FW_TYPE_506, "atmel_at76c506", "bin" },
+ { ATMEL_FW_TYPE_NONE, NULL, NULL }
+ };
++MODULE_FIRMWARE("atmel_at76c502-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c502.bin");
++MODULE_FIRMWARE("atmel_at76c502d-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c502d.bin");
++MODULE_FIRMWARE("atmel_at76c502e-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c502e.bin");
++MODULE_FIRMWARE("atmel_at76c502_3com-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c502_3com.bin");
++MODULE_FIRMWARE("atmel_at76c504-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c504.bin");
++MODULE_FIRMWARE("atmel_at76c504_2958-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c504_2958.bin");
++MODULE_FIRMWARE("atmel_at76c504a_2958-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c504a_2958.bin");
++MODULE_FIRMWARE("atmel_at76c506-wpa.bin");
++MODULE_FIRMWARE("atmel_at76c506.bin");
+
+ #define MAX_SSID_LENGTH 32
+ #define MGMT_JIFFIES (256 * HZ / 100)
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0014-ipw2100-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0014-ipw2100-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,32 @@
+From a278ea3e423f7231934ba06a29592cddad8a6663 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 21:58:47 +0000
+Subject: [PATCH 14/24] ipw2100: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Acked-by: Zhu Yi <yi.zhu at intel.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/ipw2x00/ipw2100.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
+index 240cff1..a9bc8a9 100644
+--- a/drivers/net/wireless/ipw2x00/ipw2100.c
++++ b/drivers/net/wireless/ipw2x00/ipw2100.c
+@@ -8462,6 +8462,12 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv,
+ return 0;
+ }
+
++MODULE_FIRMWARE(IPW2100_FW_NAME("-i"));
++#ifdef CONFIG_IPW2100_MONITOR
++MODULE_FIRMWARE(IPW2100_FW_NAME("-p"));
++#endif
++MODULE_FIRMWARE(IPW2100_FW_NAME(""));
++
+ static void ipw2100_release_firmware(struct ipw2100_priv *priv,
+ struct ipw2100_fw *fw)
+ {
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0015-ipw2200-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0015-ipw2200-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,31 @@
+From 873395a9fe15e5c42004e341b7d3632e6a273f73 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 21:59:10 +0000
+Subject: [PATCH 15/24] ipw2200: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Acked-by: Zhu Yi <yi.zhu at intel.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/ipw2x00/ipw2200.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
+index 61ef890..39808e9 100644
+--- a/drivers/net/wireless/ipw2x00/ipw2200.c
++++ b/drivers/net/wireless/ipw2x00/ipw2200.c
+@@ -80,6 +80,11 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
+ MODULE_VERSION(DRV_VERSION);
+ MODULE_AUTHOR(DRV_COPYRIGHT);
+ MODULE_LICENSE("GPL");
++MODULE_FIRMWARE("ipw2200-ibss.fw");
++#ifdef CONFIG_IPW2200_MONITOR
++MODULE_FIRMWARE("ipw2200-sniffer.fw");
++#endif
++MODULE_FIRMWARE("ipw2200-bss.fw");
+
+ static int cmdlog = 0;
+ static int debug = 0;
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0016-iwmc3200wifi-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0016-iwmc3200wifi-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,28 @@
+From 328aca32783cc98088151ce905977c8e899e5fc9 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 21:59:38 +0000
+Subject: [PATCH 16/24] iwmc3200wifi: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/iwmc3200wifi/sdio.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
+index cf86294..a7ec7ea 100644
+--- a/drivers/net/wireless/iwmc3200wifi/sdio.c
++++ b/drivers/net/wireless/iwmc3200wifi/sdio.c
+@@ -399,6 +399,9 @@ static struct iwm_if_ops if_sdio_ops = {
+ .calib_lmac_name = "iwmc3200wifi-calib-sdio.bin",
+ .lmac_name = "iwmc3200wifi-lmac-sdio.bin",
+ };
++MODULE_FIRMWARE("iwmc3200wifi-umac-sdio.bin");
++MODULE_FIRMWARE("iwmc3200wifi-calib-sdio.bin");
++MODULE_FIRMWARE("iwmc3200wifi-lmac-sdio.bin");
+
+ static int iwm_sdio_probe(struct sdio_func *func,
+ const struct sdio_device_id *id)
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0017-libertas-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0017-libertas-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,74 @@
+From a974a4bbcb1ceddc9c89defd7dab4da4b2b53d77 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 22:00:03 +0000
+Subject: [PATCH 17/24] libertas: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/libertas/if_cs.c | 1 +
+ drivers/net/wireless/libertas/if_sdio.c | 6 ++++++
+ drivers/net/wireless/libertas/if_spi.c | 4 ++++
+ 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 465742f..875516d 100644
+--- a/drivers/net/wireless/libertas/if_cs.c
++++ b/drivers/net/wireless/libertas/if_cs.c
+@@ -48,6 +48,7 @@
+ MODULE_AUTHOR("Holger Schurig <hs4233 at 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/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
+index 9716728..09fcfad 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[] = {
+ .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/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
+index d6a48dd..bf4bfba 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,
+ 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/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
+index f12d667..65e1745 100644
+--- a/drivers/net/wireless/libertas/if_usb.c
++++ b/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) },
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0018-libertas_tf_usb-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0018-libertas_tf_usb-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,27 @@
+From 790e7560c09a0184afcc00ac0f8df95de7468acc Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 22:00:38 +0000
+Subject: [PATCH 18/24] libertas_tf_usb: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/libertas_tf/if_usb.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
+index 392337b..3691c30 100644
+--- a/drivers/net/wireless/libertas_tf/if_usb.c
++++ b/drivers/net/wireless/libertas_tf/if_usb.c
+@@ -23,6 +23,8 @@
+ static char *lbtf_fw_name = "lbtf_usb.bin";
+ module_param_named(fw_name, lbtf_fw_name, charp, 0644);
+
++MODULE_FIRMWARE("lbtf_usb.bin");
++
+ static struct usb_device_id if_usb_table[] = {
+ /* Enter the device signature inside */
+ { USB_DEVICE(0x1286, 0x2001) },
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0019-mwl8k-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0019-mwl8k-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,28 @@
+From 7e75b942f67a13a9980c5e2b4fa1993b20426284 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 22:00:57 +0000
+Subject: [PATCH 19/24] mwl8k: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/mwl8k.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
+index 2ebfee4..9e64dd4 100644
+--- a/drivers/net/wireless/mwl8k.c
++++ b/drivers/net/wireless/mwl8k.c
+@@ -400,6 +400,9 @@ 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;
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0020-orinoco-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0020-orinoco-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,32 @@
+From 6f48d0e981c026572eac643ed43ebfb883048c14 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 22:01:29 +0000
+Subject: [PATCH 20/24] orinoco: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Pavel Roskin <proski at gnu.org>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/orinoco/fw.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c
+index 1257250..cfa7296 100644
+--- a/drivers/net/wireless/orinoco/fw.c
++++ b/drivers/net/wireless/orinoco/fw.c
+@@ -28,6 +28,12 @@ static const struct fw_info orinoco_fw[] = {
+ { NULL, "prism_sta_fw.bin", "prism_ap_fw.bin", 0, 1024 },
+ { "symbol_sp24t_prim_fw", "symbol_sp24t_sec_fw", NULL, 0x00003100, 512 }
+ };
++MODULE_FIRMWARE("agere_sta_fw.bin");
++MODULE_FIRMWARE("agere_ap_fw.bin");
++MODULE_FIRMWARE("prism_sta_fw.bin");
++MODULE_FIRMWARE("prism_ap_fw.bin");
++MODULE_FIRMWARE("symbol_sp24t_prim_fw");
++MODULE_FIRMWARE("symbol_sp24t_sec_fw");
+
+ /* Structure used to access fields in FW
+ * Make sure LE decoding macros are used
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0021-prism54-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0021-prism54-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,28 @@
+From a830e6599263aa535e298f5f834f3a119050757f Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 22:01:55 +0000
+Subject: [PATCH 21/24] prism54: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/prism54/islpci_dev.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c
+index e26d7b3..3e6a71c 100644
+--- a/drivers/net/wireless/prism54/islpci_dev.c
++++ b/drivers/net/wireless/prism54/islpci_dev.c
+@@ -40,6 +40,9 @@
+ #define ISL3877_IMAGE_FILE "isl3877"
+ #define ISL3886_IMAGE_FILE "isl3886"
+ #define ISL3890_IMAGE_FILE "isl3890"
++MODULE_FIRMWARE(ISL3877_IMAGE_FILE);
++MODULE_FIRMWARE(ISL3886_IMAGE_FILE);
++MODULE_FIRMWARE(ISL3890_IMAGE_FILE);
+
+ static int prism54_bring_down(islpci_private *);
+ static int islpci_alloc_memory(islpci_private *);
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0022-wl12xx-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0022-wl12xx-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,17 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH 22/24] wl12xx: declare MODULE_FIRMWARE
+
+--- a/drivers/net/wireless/wl12xx/wl1251_main.c
++++ b/drivers/net/wireless/wl12xx/wl1251_main.c
+@@ -1431,3 +1431,4 @@ MODULE_DESCRIPTION("TI wl1251 Wireles LAN Driver Core");
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Kalle Valo <kalle.valo at nokia.com>");
+ MODULE_ALIAS("spi:wl12xx");
++MODULE_FIRMWARE(WL1251_FW_NAME);
+--- a/drivers/net/wireless/wl12xx/wl1271_main.c
++++ b/drivers/net/wireless/wl12xx/wl1271_main.c
+@@ -1979,3 +1979,4 @@ module_exit(wl1271_exit);
+
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Luciano Coelho <luciano.coelho at nokia.com>");
++MODULE_FIRMWARE(WL1271_FW_NAME);
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0023-zd1201-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0023-zd1201-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,28 @@
+From e01b0e0f90681072d29fe1ba6a29298683f42c15 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 22:02:39 +0000
+Subject: [PATCH 23/24] zd1201: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/zd1201.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
+index bc81974..33c8be7 100644
+--- a/drivers/net/wireless/zd1201.c
++++ b/drivers/net/wireless/zd1201.c
+@@ -112,6 +112,9 @@ exit:
+ return err;
+ }
+
++MODULE_FIRMWARE("zd1201-ap.fw");
++MODULE_FIRMWARE("zd1201.fw");
++
+ static void zd1201_usbfree(struct urb *urb)
+ {
+ struct zd1201 *zd = urb->context;
+--
+1.6.5.3
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0024-zd1211rw-declare-MODULE_FIRMWARE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/module-firmware/0024-zd1211rw-declare-MODULE_FIRMWARE.patch Thu Dec 3 23:38:41 2009 (r14720)
@@ -0,0 +1,32 @@
+From 3e8b4d006ed04b1ddb7450faee7fa429e2a00e48 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 Nov 2009 22:03:22 +0000
+Subject: [PATCH 24/24] zd1211rw: declare MODULE_FIRMWARE
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/zd1211rw/zd_usb.c | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
+index d46f20a..ac19ecd 100644
+--- a/drivers/net/wireless/zd1211rw/zd_usb.c
++++ b/drivers/net/wireless/zd1211rw/zd_usb.c
+@@ -318,6 +318,13 @@ error:
+ return r;
+ }
+
++MODULE_FIRMWARE(FW_ZD1211B_PREFIX "ur");
++MODULE_FIRMWARE(FW_ZD1211_PREFIX "ur");
++MODULE_FIRMWARE(FW_ZD1211B_PREFIX "ub");
++MODULE_FIRMWARE(FW_ZD1211_PREFIX "ub");
++MODULE_FIRMWARE(FW_ZD1211B_PREFIX "uphr");
++MODULE_FIRMWARE(FW_ZD1211_PREFIX "uphr");
++
+ /* Read data from device address space using "firmware interface" which does
+ * not require firmware to be loaded. */
+ int zd_usb_read_fw(struct zd_usb *usb, zd_addr_t addr, u8 *data, u16 len)
+--
+1.6.5.3
+
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Thu Dec 3 11:20:21 2009 (r14719)
+++ dists/trunk/linux-2.6/debian/patches/series/base Thu Dec 3 23:38:41 2009 (r14720)
@@ -52,3 +52,28 @@
+ bugfix/all/DocBook-media-copy-images-after-building-HTML.patch
+ bugfix/all/DocBook-media-create-links-for-included-sources.patch
+ features/all/mmc-parameter-set-whether-cards-are-assumed-removable.patch
+
++ features/all/module-firmware/0001-netxen-module-firmware-hints.patch
++ features/all/module-firmware/0002-netx-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0003-solos-pci-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0004-ambassador-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0005-bnx2x-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0006-cxgb3-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0007-myri10ge-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0008-spider-net-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0009-tms380tr-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0010-pcnet-cs-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0011-speedfax-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0012-at76c50x-usb-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0013-atmel-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0014-ipw2100-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0015-ipw2200-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0016-iwmc3200wifi-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0017-libertas-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0018-libertas_tf_usb-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0019-mwl8k-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0020-orinoco-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0021-prism54-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0022-wl12xx-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0023-zd1201-declare-MODULE_FIRMWARE.patch
++ features/all/module-firmware/0024-zd1211rw-declare-MODULE_FIRMWARE.patch
More information about the Kernel-svn-changes
mailing list