UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove config option B43_LEGACY_RFKILL completely 

In f41f3f373d the B43 driver was ported
to use the cfg80211 API for rfkill and consequently the config option
was dropped (RFKILL is now unconditionally enabled).

However in the Kernel Info the feature is still checked and reported
missing. This patch just removes the conditional and the relevant code
blocks while still reporting that feature unconditionally would be
another option (it's always there).

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Christoph Egger 2010-01-13 14:36:24 +01:00 committed by John W. Linville
parent ececeecee8
commit 2f1f00fc9b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/b43legacy/main.c
View File

@ -3962,7 +3962,7 @@ static struct ssb_driver b43legacy_ssb_driver = {
static void b43legacy_print_driverinfo(void) static void b43legacy_print_driverinfo(void)
{ {
const char *feat_pci = "", *feat_leds = "", *feat_rfkill = "", const char *feat_pci = "", *feat_leds = "",
*feat_pio = "", *feat_dma = ""; *feat_pio = "", *feat_dma = "";
#ifdef CONFIG_B43LEGACY_PCI_AUTOSELECT #ifdef CONFIG_B43LEGACY_PCI_AUTOSELECT
@ -3971,9 +3971,6 @@ static void b43legacy_print_driverinfo(void)
#ifdef CONFIG_B43LEGACY_LEDS #ifdef CONFIG_B43LEGACY_LEDS
feat_leds = "L"; feat_leds = "L";
#endif #endif
#ifdef CONFIG_B43LEGACY_RFKILL
feat_rfkill = "R";
#endif
#ifdef CONFIG_B43LEGACY_PIO #ifdef CONFIG_B43LEGACY_PIO
feat_pio = "I"; feat_pio = "I";
#endif #endif
@ -3981,9 +3978,9 @@ static void b43legacy_print_driverinfo(void)
feat_dma = "D"; feat_dma = "D";
#endif #endif
printk(KERN_INFO "Broadcom 43xx-legacy driver loaded " printk(KERN_INFO "Broadcom 43xx-legacy driver loaded "
"[ Features: %s%s%s%s%s, Firmware-ID: " "[ Features: %s%s%s%s, Firmware-ID: "
B43legacy_SUPPORTED_FIRMWARE_ID " ]\n", B43legacy_SUPPORTED_FIRMWARE_ID " ]\n",
feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma); feat_pci, feat_leds, feat_pio, feat_dma);
} }
static int __init b43legacy_init(void) static int __init b43legacy_init(void)