aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-06-16 09:25:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-06-16 09:25:41 +0000
commiteec5a38d06882de54a80832e9380c3b123ac6d6b (patch)
tree8f955be7e45730b96814652b93086d4467842f95
parent5fb5b75668de4905edba27be4f503316e298b2e4 (diff)
downloadupstream-eec5a38d06882de54a80832e9380c3b123ac6d6b.tar.gz
upstream-eec5a38d06882de54a80832e9380c3b123ac6d6b.tar.bz2
upstream-eec5a38d06882de54a80832e9380c3b123ac6d6b.zip
mac80211: fix disabling rfkill support
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36940 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/010-disable_rfkill.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/010-disable_rfkill.patch b/package/mac80211/patches/010-disable_rfkill.patch
index 221ec6a87d..c5a92d6b48 100644
--- a/package/mac80211/patches/010-disable_rfkill.patch
+++ b/package/mac80211/patches/010-disable_rfkill.patch
@@ -1,13 +1,13 @@
--- a/backport-include/linux/rfkill.h
+++ b/backport-include/linux/rfkill.h
-@@ -43,6 +43,10 @@ struct rfkill_ops {
- };
- #endif
+@@ -2,6 +2,10 @@
+ #define __COMPAT_RFKILL_H
+ #include <linux/version.h>
+#undef CONFIG_RFKILL
+#undef CONFIG_RFKILL_LEDS
+#undef CONFIG_RFKILL_MODULE
+
- /* this changes infrequently, backport manually */
- enum rfkill_type {
- RFKILL_TYPE_ALL = 0,
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+ #include_next <linux/rfkill.h>
+ #else