mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
mac80211: update to wireless-testing 2012-04-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31322 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,26 +1,26 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -83,7 +83,7 @@ endif # build check
|
||||
@@ -77,7 +77,7 @@ endif # build check
|
||||
endif # kernel Makefile check
|
||||
|
||||
# These both are needed by compat-wireless || compat-bluetooth so enable them
|
||||
- CONFIG_COMPAT_RFKILL=y
|
||||
+# CONFIG_COMPAT_RFKILL=y
|
||||
- export CONFIG_COMPAT_RFKILL=y
|
||||
+# export CONFIG_COMPAT_RFKILL=y
|
||||
|
||||
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")
|
||||
@@ -674,10 +674,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
|
||||
@@ -668,10 +668,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
|
||||
# We need the backported rfkill module on kernel < 2.6.31.
|
||||
# In more recent kernel versions use the in kernel rfkill module.
|
||||
ifdef CONFIG_COMPAT_KERNEL_2_6_31
|
||||
-CONFIG_RFKILL_BACKPORT=m
|
||||
+# CONFIG_RFKILL_BACKPORT=m
|
||||
-export CONFIG_RFKILL_BACKPORT=m
|
||||
+#export CONFIG_RFKILL_BACKPORT=m
|
||||
ifdef CONFIG_LEDS_TRIGGERS
|
||||
-CONFIG_RFKILL_BACKPORT_LEDS=y
|
||||
+# CONFIG_RFKILL_BACKPORT_LEDS=y
|
||||
-export CONFIG_RFKILL_BACKPORT_LEDS=y
|
||||
+#export CONFIG_RFKILL_BACKPORT_LEDS=y
|
||||
endif #CONFIG_LEDS_TRIGGERS
|
||||
-CONFIG_RFKILL_BACKPORT_INPUT=y
|
||||
+# CONFIG_RFKILL_BACKPORT_INPUT=y
|
||||
-export CONFIG_RFKILL_BACKPORT_INPUT=y
|
||||
+#export CONFIG_RFKILL_BACKPORT_INPUT=y
|
||||
endif #CONFIG_COMPAT_KERNEL_2_6_31
|
||||
|
||||
--- a/include/linux/rfkill.h
|
||||
|
||||
Reference in New Issue
Block a user