From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 25 Nov 2010 14:45:18 +0000 (+0000)
Subject: mac80211: cfg80211 should not depend on rfkill.
X-Git-Tag: reboot~18268
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=18aa0b3d4c4abef102baa3fd07c5695892f9d2a3;p=oweals%2Fopenwrt.git

mac80211: cfg80211 should not depend on rfkill.

If rfkill is build as an module CONFIG_RFKILL_MODULE is set and cfg80211 will also depend on that.
Now all modules build from compat-wireless will not use rfkill.

SVN-Revision: 24143
---

diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index d6b7cf2325..7e4274f176 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -21,3 +21,16 @@
 +# CONFIG_RFKILL_BACKPORT_INPUT=y
  endif #CONFIG_COMPAT_KERNEL_31
  
+--- 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