3 @@ -74,7 +74,7 @@ endif # build check
4 endif # kernel Makefile check
6 # These both are needed by compat-wireless || compat-bluetooth so enable them
7 - CONFIG_COMPAT_RFKILL=y
8 +# CONFIG_COMPAT_RFKILL=y
10 ifeq ($(CONFIG_MAC80211),y)
11 $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
12 @@ -588,8 +588,8 @@ endif #CONFIG_COMPAT_KERNEL_27
13 # We need the backported rfkill module on kernel < 2.6.31.
14 # In more recent kernel versions use the in kernel rfkill module.
15 ifdef CONFIG_COMPAT_KERNEL_31
16 -CONFIG_RFKILL_BACKPORT=m
17 -CONFIG_RFKILL_BACKPORT_LEDS=y
18 -CONFIG_RFKILL_BACKPORT_INPUT=y
19 +# CONFIG_RFKILL_BACKPORT=m
20 +# CONFIG_RFKILL_BACKPORT_LEDS=y
21 +# CONFIG_RFKILL_BACKPORT_INPUT=y
22 endif #CONFIG_COMPAT_KERNEL_31
24 --- a/include/linux/rfkill.h
25 +++ b/include/linux/rfkill.h
28 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
31 +#undef CONFIG_RFKILL_LEDS
32 +#undef CONFIG_RFKILL_MODULE
34 #include_next <linux/rfkill.h>