mac80211: sync with changes to patches submitted upstream
[openwrt.git] / package / mac80211 / patches / 002-disable_rfkill.patch
1 --- a/config.mk
2 +++ b/config.mk
3 @@ -147,7 +147,7 @@ ifneq ($(CONFIG_PCI),)
4
5 CONFIG_ATH5K=m
6 # CONFIG_ATH5K_DEBUG=y
7 -CONFIG_ATH5K_RFKILL=y
8 +# CONFIG_ATH5K_RFKILL=y
9 CONFIG_ATH9K_HW=m
10 CONFIG_ATH9K=m
11 # Note: once ath9k_htc is added we'll have to move
12 @@ -159,7 +159,7 @@ CONFIG_ATH9K_COMMON=m
13
14 CONFIG_IWLWIFI=m
15 CONFIG_IWLWIFI_LEDS=y
16 -CONFIG_IWLWIFI_RFKILL=y
17 +# CONFIG_IWLWIFI_RFKILL=y
18 CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
19 # CONFIG_IWLWIFI_DEBUG=y
20 # CONFIG_IWLWIFI_DEBUGFS=y
21 @@ -179,7 +179,7 @@ CONFIG_B43_PCMCIA=y
22 endif
23 CONFIG_B43_PIO=y
24 CONFIG_B43_LEDS=y
25 -CONFIG_B43_RFKILL=y
26 +# CONFIG_B43_RFKILL=y
27 CONFIG_B43_PHY_LP=y
28 # CONFIG_B43_DEBUG=y
29 # CONFIG_B43_FORCE_PIO=y
30 @@ -189,7 +189,7 @@ CONFIG_B43LEGACY_HWRNG=y
31 CONFIG_B43LEGACY_PCI_AUTOSELECT=y
32 CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
33 CONFIG_B43LEGACY_LEDS=y
34 -CONFIG_B43LEGACY_RFKILL=y
35 +# CONFIG_B43LEGACY_RFKILL=y
36 # CONFIG_B43LEGACY_DEBUG=y
37 CONFIG_B43LEGACY_DMA=y
38 CONFIG_B43LEGACY_PIO=y
39 @@ -422,8 +422,8 @@ endif
40 # We need the backported rfkill module on kernel < 2.6.31.
41 # In more recent kernel versions use the in kernel rfkill module.
42 ifdef CONFIG_COMPAT_WIRELESS_31
43 -CONFIG_RFKILL_BACKPORT=m
44 -CONFIG_RFKILL_BACKPORT_LEDS=y
45 -CONFIG_RFKILL_BACKPORT_INPUT=y
46 +# CONFIG_RFKILL_BACKPORT=m
47 +# CONFIG_RFKILL_BACKPORT_LEDS=y
48 +# CONFIG_RFKILL_BACKPORT_INPUT=y
49 endif
50
This page took 0.045869 seconds and 5 git commands to generate.