summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/002-disable_rfkill.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-09-14 22:53:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-09-14 22:53:54 +0000
commitfc7fbe83490df97271a50ded051aa312a6260e51 (patch)
treec75075ffb981ba2906a4b36a465adcea6858031f /package/mac80211/patches/002-disable_rfkill.patch
parent9c2cfd7a1bfc67cc12e08160d9808f39fd68e318 (diff)
downloadmtk-20170518-fc7fbe83490df97271a50ded051aa312a6260e51.zip
mtk-20170518-fc7fbe83490df97271a50ded051aa312a6260e51.tar.gz
mtk-20170518-fc7fbe83490df97271a50ded051aa312a6260e51.tar.bz2
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
SVN-Revision: 23061
Diffstat (limited to 'package/mac80211/patches/002-disable_rfkill.patch')
-rw-r--r--package/mac80211/patches/002-disable_rfkill.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index 2025797..979435f 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -1,6 +1,6 @@
--- a/config.mk
+++ b/config.mk
-@@ -72,7 +72,7 @@ endif # build check
+@@ -74,7 +74,7 @@ endif # build check
endif # kernel Makefile check
# These both are needed by compat-wireless || compat-bluetooth so enable them
@@ -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")
-@@ -557,8 +557,8 @@ endif #CONFIG_COMPAT_KERNEL_27
+@@ -572,8 +572,8 @@ endif #CONFIG_COMPAT_KERNEL_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_31