2009-08-20 16:52:46 +00:00
--- a/config.mk
+++ b/config.mk
2012-04-16 21:08:41 +00:00
@@ -77,7 +77,7 @@ endif # build check
2010-01-15 01:16:40 +00:00
endif # kernel Makefile check
2010-01-07 19:15:05 +00:00
# These both are needed by compat-wireless || compat-bluetooth so enable them
2012-04-16 21:08:41 +00:00
- export CONFIG_COMPAT_RFKILL=y
+# export CONFIG_COMPAT_RFKILL=y
2010-01-07 19:15:05 +00:00
ifeq ($(CONFIG_MAC80211),y)
$(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")
2012-07-10 00:21:25 +00:00
@@ -688,10 +688,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
2009-08-20 16:52:46 +00:00
# We need the backported rfkill module on kernel < 2.6.31.
# In more recent kernel versions use the in kernel rfkill module.
2011-06-15 21:16:38 +00:00
ifdef CONFIG_COMPAT_KERNEL_2_6_31
2012-04-16 21:08:41 +00:00
-export CONFIG_RFKILL_BACKPORT=m
+#export CONFIG_RFKILL_BACKPORT=m
2011-01-09 20:32:25 +00:00
ifdef CONFIG_LEDS_TRIGGERS
2012-04-16 21:08:41 +00:00
-export CONFIG_RFKILL_BACKPORT_LEDS=y
+#export CONFIG_RFKILL_BACKPORT_LEDS=y
2011-01-09 20:32:25 +00:00
endif #CONFIG_LEDS_TRIGGERS
2012-04-16 21:08:41 +00:00
-export CONFIG_RFKILL_BACKPORT_INPUT=y
+#export CONFIG_RFKILL_BACKPORT_INPUT=y
2011-06-15 21:16:38 +00:00
endif #CONFIG_COMPAT_KERNEL_2_6_31
2009-08-20 16:52:46 +00:00
2010-11-25 14:45:18 +00:00
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -3,6 +3,10 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31))
+#undef CONFIG_RFKILL
+#undef CONFIG_RFKILL_LEDS
+#undef CONFIG_RFKILL_MODULE
+
#include_next <linux/rfkill.h>
#else