aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/002-disable_rfkill.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-07 19:15:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-07 19:15:05 +0000
commitfe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9 (patch)
treebf23be761a1a1f263cc95903ce34be26489fdc03 /package/mac80211/patches/002-disable_rfkill.patch
parentc97341b7614c25b30f19856e300718114ab1435f (diff)
downloadupstream-fe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9.tar.gz
upstream-fe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9.tar.bz2
upstream-fe32f100a8cd9fd6f65d74632a0cdc9fb57c2dd9.zip
mac80211: update to compat-wireless 2010-01-07 (unoffical snapshot, official ones are not working yet)
SVN-Revision: 19063
Diffstat (limited to 'package/mac80211/patches/002-disable_rfkill.patch')
-rw-r--r--package/mac80211/patches/002-disable_rfkill.patch13
1 files changed, 11 insertions, 2 deletions
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index c935fddf35..da07a76bd6 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -1,9 +1,18 @@
--- a/config.mk
+++ b/config.mk
-@@ -421,8 +421,8 @@ endif
+@@ -16,7 +16,7 @@ include $(KLIB_BUILD)/.config
+ endif
+
+ # These both are needed by compat-wireless || compat-bluetooth so enable them
+- CONFIG_COMPAT_RFKILL=y
++# 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")
+@@ -463,8 +463,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_WIRELESS_31
+ ifdef CONFIG_COMPAT_KERNEL_31
-CONFIG_RFKILL_BACKPORT=m
-CONFIG_RFKILL_BACKPORT_LEDS=y
-CONFIG_RFKILL_BACKPORT_INPUT=y