summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/002-disable_rfkill.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-27 16:23:43 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-27 16:23:43 +0000
commitf2d1a93055cb15d4e82cd5e8d430410c986995cf (patch)
tree317bfad60ab172b9f99ac52e96264c0d77a2a89f /package/mac80211/patches/002-disable_rfkill.patch
parent79d9ad50db72f5bb20425d9908976268637658c3 (diff)
mac80211: update to wireless-testing 2012-02-23
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30742 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/002-disable_rfkill.patch')
-rw-r--r--package/mac80211/patches/002-disable_rfkill.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index 4380d9391..94249413b 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -1,6 +1,6 @@
--- a/config.mk
+++ b/config.mk
-@@ -95,7 +95,7 @@ endif # build check
+@@ -83,7 +83,7 @@ endif # build check
endif # kernel Makefile check
# These both are needed by compat-wireless || compat-bluetooth so enable them
@@ -9,7 +9,7 @@
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")
-@@ -684,10 +684,10 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
+@@ -674,10 +674,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