diff options
author | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
commit | 6373464288cab09bc641be301d8d30fc9f64ba71 (patch) | |
tree | c1bc92dc630aa15da2e12bc0d09c92169817a702 /drivers/net/wireless/b43legacy/main.c | |
parent | 6d955180b2f9ccff444df06265160868cabb289a (diff) | |
parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index fbae264095cc..874a64a6c610 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -61,6 +61,8 @@ MODULE_AUTHOR("Michael Buesch"); | |||
61 | MODULE_LICENSE("GPL"); | 61 | MODULE_LICENSE("GPL"); |
62 | 62 | ||
63 | MODULE_FIRMWARE(B43legacy_SUPPORTED_FIRMWARE_ID); | 63 | MODULE_FIRMWARE(B43legacy_SUPPORTED_FIRMWARE_ID); |
64 | MODULE_FIRMWARE("b43legacy/ucode2.fw"); | ||
65 | MODULE_FIRMWARE("b43legacy/ucode4.fw"); | ||
64 | 66 | ||
65 | #if defined(CONFIG_B43LEGACY_DMA) && defined(CONFIG_B43LEGACY_PIO) | 67 | #if defined(CONFIG_B43LEGACY_DMA) && defined(CONFIG_B43LEGACY_PIO) |
66 | static int modparam_pio; | 68 | static int modparam_pio; |
@@ -3960,7 +3962,7 @@ static struct ssb_driver b43legacy_ssb_driver = { | |||
3960 | 3962 | ||
3961 | static void b43legacy_print_driverinfo(void) | 3963 | static void b43legacy_print_driverinfo(void) |
3962 | { | 3964 | { |
3963 | const char *feat_pci = "", *feat_leds = "", *feat_rfkill = "", | 3965 | const char *feat_pci = "", *feat_leds = "", |
3964 | *feat_pio = "", *feat_dma = ""; | 3966 | *feat_pio = "", *feat_dma = ""; |
3965 | 3967 | ||
3966 | #ifdef CONFIG_B43LEGACY_PCI_AUTOSELECT | 3968 | #ifdef CONFIG_B43LEGACY_PCI_AUTOSELECT |
@@ -3969,9 +3971,6 @@ static void b43legacy_print_driverinfo(void) | |||
3969 | #ifdef CONFIG_B43LEGACY_LEDS | 3971 | #ifdef CONFIG_B43LEGACY_LEDS |
3970 | feat_leds = "L"; | 3972 | feat_leds = "L"; |
3971 | #endif | 3973 | #endif |
3972 | #ifdef CONFIG_B43LEGACY_RFKILL | ||
3973 | feat_rfkill = "R"; | ||
3974 | #endif | ||
3975 | #ifdef CONFIG_B43LEGACY_PIO | 3974 | #ifdef CONFIG_B43LEGACY_PIO |
3976 | feat_pio = "I"; | 3975 | feat_pio = "I"; |
3977 | #endif | 3976 | #endif |
@@ -3979,9 +3978,9 @@ static void b43legacy_print_driverinfo(void) | |||
3979 | feat_dma = "D"; | 3978 | feat_dma = "D"; |
3980 | #endif | 3979 | #endif |
3981 | printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " | 3980 | printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " |
3982 | "[ Features: %s%s%s%s%s, Firmware-ID: " | 3981 | "[ Features: %s%s%s%s, Firmware-ID: " |
3983 | B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", | 3982 | B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", |
3984 | feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); | 3983 | feat_pci, feat_leds, feat_pio, feat_dma); |
3985 | } | 3984 | } |
3986 | 3985 | ||
3987 | static int __init b43legacy_init(void) | 3986 | static int __init b43legacy_init(void) |