aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/002-disable_rfkill.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-15 01:16:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-15 01:16:40 +0000
commit6f5cd22319c93386e6a0fbec95de71a8c5d2356d (patch)
tree9a1173458a7f2febebb2b329eda4e21cd3418f3f /package/mac80211/patches/002-disable_rfkill.patch
parent40470f71fcf0a12dbd4cd9bcbb74225b8dff994d (diff)
downloadupstream-6f5cd22319c93386e6a0fbec95de71a8c5d2356d.tar.gz
upstream-6f5cd22319c93386e6a0fbec95de71a8c5d2356d.tar.bz2
upstream-6f5cd22319c93386e6a0fbec95de71a8c5d2356d.zip
mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
SVN-Revision: 19139
Diffstat (limited to 'package/mac80211/patches/002-disable_rfkill.patch')
-rw-r--r--package/mac80211/patches/002-disable_rfkill.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index da07a76bd6..222cd9b544 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -1,7 +1,7 @@
--- a/config.mk
+++ b/config.mk
-@@ -16,7 +16,7 @@ include $(KLIB_BUILD)/.config
- endif
+@@ -73,7 +73,7 @@ endif # build check
+ endif # kernel Makefile check
# These both are needed by compat-wireless || compat-bluetooth so enable them
- CONFIG_COMPAT_RFKILL=y
@@ -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")
-@@ -463,8 +463,8 @@ endif
+@@ -474,8 +474,8 @@ endif
# 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_31