Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f1f00fc authored by Christoph Egger's avatar Christoph Egger Committed by John W. Linville
Browse files

Remove config option B43_LEGACY_RFKILL completely 



In f41f3f37 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: default avatarChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ececeece

drivers/net/wireless/b43legacy/main.c

+3 −6
Original line number Diff line number Diff line
@@ -3962,7 +3962,7 @@ static struct ssb_driver b43legacy_ssb_driver = { 


static void b43legacy_print_driverinfo(void)

{

	const char *feat_pci = "", *feat_leds = "", *feat_rfkill = "",

	const char *feat_pci = "", *feat_leds = "",

		   *feat_pio = "", *feat_dma = "";



#ifdef CONFIG_B43LEGACY_PCI_AUTOSELECT
@@ -3971,9 +3971,6 @@ static void b43legacy_print_driverinfo(void) 
#ifdef CONFIG_B43LEGACY_LEDS

	feat_leds = "L";

#endif

#ifdef CONFIG_B43LEGACY_RFKILL

	feat_rfkill = "R";

#endif

#ifdef CONFIG_B43LEGACY_PIO

	feat_pio = "I";

#endif
@@ -3981,9 +3978,9 @@ static void b43legacy_print_driverinfo(void) 
	feat_dma = "D";

#endif

	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",

	       feat_pci, feat_leds, feat_rfkill, feat_pio, feat_dma);

	       feat_pci, feat_leds, feat_pio, feat_dma);

}



static int __init b43legacy_init(void)