diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-12-06 14:11:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-12-06 14:11:09 +0000 |
| commit | 3e5940532d864795e4081585c6200a93d12cbd47 (patch) | |
| tree | c7db81accaba2b13ed9ee94133d6b93e822acaae /package/mac80211/patches/002-disable_rfkill.patch | |
| parent | 85ce5212fe946a07366f10067ae42c8f004f85ce (diff) | |
| download | upstream-3e5940532d864795e4081585c6200a93d12cbd47.tar.gz upstream-3e5940532d864795e4081585c6200a93d12cbd47.tar.bz2 upstream-3e5940532d864795e4081585c6200a93d12cbd47.zip | |
mac80211: clean up patches, replace patching config.mk with a generated sed expression
SVN-Revision: 34531
Diffstat (limited to 'package/mac80211/patches/002-disable_rfkill.patch')
| -rw-r--r-- | package/mac80211/patches/002-disable_rfkill.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch deleted file mode 100644 index 685006bd58..0000000000 --- a/package/mac80211/patches/002-disable_rfkill.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -78,7 +78,7 @@ endif # build check - endif # kernel Makefile check - - # These both are needed by 802.11 and bluetooth so enable -- export CONFIG_COMPAT_RFKILL=y -+# export 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") -@@ -690,10 +690,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 --export CONFIG_RFKILL_BACKPORT=m -+#export CONFIG_RFKILL_BACKPORT=m - ifdef CONFIG_LEDS_TRIGGERS --export CONFIG_RFKILL_BACKPORT_LEDS=y -+#export CONFIG_RFKILL_BACKPORT_LEDS=y - endif #CONFIG_LEDS_TRIGGERS --export CONFIG_RFKILL_BACKPORT_INPUT=y -+#export CONFIG_RFKILL_BACKPORT_INPUT=y - endif #CONFIG_COMPAT_KERNEL_2_6_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 |