diff options
author | Michael Büsch <m@bues.ch> | 2011-08-21 11:24:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-24 14:57:17 -0400 |
commit | 8b0be90c4d3770b0c31489fc3ae33e5d8ba9edf8 (patch) | |
tree | 62844fa14193a3f825a2e3c3c711e20645df7f15 /drivers/net/wireless/b43legacy | |
parent | 8ad38d22dc6f6c244642ca1fbe9255d7d149870a (diff) |
b43/legacy: Remove firmware IDs
This removes the "FWxx" ID strings from the b43 and b43legacy
drivers. They were once used to match a specific driver revision
to a set of firmware files. However, this is hardly useful today.
Additionally, the IDs are not updated and maintained properly, so
they might mislead users.
Signed-off-by: Michael Buesch <m@bues.ch>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43legacy')
-rw-r--r-- | drivers/net/wireless/b43legacy/b43legacy.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h index ad4e743e4765..12b518251581 100644 --- a/drivers/net/wireless/b43legacy/b43legacy.h +++ b/drivers/net/wireless/b43legacy/b43legacy.h | |||
@@ -22,10 +22,6 @@ | |||
22 | #include "phy.h" | 22 | #include "phy.h" |
23 | 23 | ||
24 | 24 | ||
25 | /* The unique identifier of the firmware that's officially supported by this | ||
26 | * driver version. */ | ||
27 | #define B43legacy_SUPPORTED_FIRMWARE_ID "FW10" | ||
28 | |||
29 | #define B43legacy_IRQWAIT_MAX_RETRIES 20 | 25 | #define B43legacy_IRQWAIT_MAX_RETRIES 20 |
30 | 26 | ||
31 | /* MMIO offsets */ | 27 | /* MMIO offsets */ |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index aae8dfcb852e..468d1836548e 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -60,7 +60,6 @@ MODULE_AUTHOR("Stefano Brivio"); | |||
60 | MODULE_AUTHOR("Michael Buesch"); | 60 | MODULE_AUTHOR("Michael Buesch"); |
61 | MODULE_LICENSE("GPL"); | 61 | MODULE_LICENSE("GPL"); |
62 | 62 | ||
63 | MODULE_FIRMWARE(B43legacy_SUPPORTED_FIRMWARE_ID); | ||
64 | MODULE_FIRMWARE("b43legacy/ucode2.fw"); | 63 | MODULE_FIRMWARE("b43legacy/ucode2.fw"); |
65 | MODULE_FIRMWARE("b43legacy/ucode4.fw"); | 64 | MODULE_FIRMWARE("b43legacy/ucode4.fw"); |
66 | 65 | ||
@@ -3947,8 +3946,7 @@ static void b43legacy_print_driverinfo(void) | |||
3947 | feat_dma = "D"; | 3946 | feat_dma = "D"; |
3948 | #endif | 3947 | #endif |
3949 | printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " | 3948 | printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " |
3950 | "[ Features: %s%s%s%s, Firmware-ID: " | 3949 | "[ Features: %s%s%s%s ]\n", |
3951 | B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", | ||
3952 | feat_pci, feat_leds, feat_pio, feat_dma); | 3950 | feat_pci, feat_leds, feat_pio, feat_dma); |
3953 | } | 3951 | } |
3954 | 3952 | ||