brcmsmac: document firmware dependencies

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Sat Sep 29 10:59:34 EDT 2012


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=faa97bd4a43ac69a55029e3b07708bdff0959c07
Commit:     faa97bd4a43ac69a55029e3b07708bdff0959c07
Parent:     c771b518199eb329c3a38e479b36b36553e25b2d
Author:     Jeff Mahoney <jeffm at suse.com>
AuthorDate: Mon Aug 6 15:17:26 2012 -0400
Committer:  John W. Linville <linville at tuxdriver.com>
CommitDate: Fri Aug 10 15:27:21 2012 -0400

    brcmsmac: document firmware dependencies
    
    The brcmsmac driver requests firmware but doesn't document the
    dependency. This means that software that analyzes the modules to
    determine if firmware is needed won't detect it.
    
    Specifically, (at least) openSUSE won't install the kernel-firmware
    package if no hardware requires it.
    
    This patch adds the MODULE_FIRMWARE directives.
    
    Signed-off-by: Jeff Mahoney <jeffm at suse.com>
    Acked-by: Arend van Spriel <arend at broadcom.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 9e79d47..683a865 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -86,7 +86,9 @@ MODULE_AUTHOR("Broadcom Corporation");
 MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
 MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
-
+/* This needs to be adjusted when brcms_firmwares changes */
+MODULE_FIRMWARE("brcm/bcm43xx-0.fw");
+MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw");
 
 /* recognized BCMA Core IDs */
 static struct bcma_device_id brcms_coreid_table[] = {



More information about the linux-mtd-cvs mailing list