diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-14 22:53:54 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-14 22:53:54 +0000 |
| commit | e30b799cdce79c4fe33c8bd09d2f289baf788382 (patch) | |
| tree | 0bfc5f31cc4ea54f7253c14f510eac831f1495d0 /package/mac80211/patches/002-disable_rfkill.patch | |
| parent | 872d5928d93dcbb73d86a06bfe3981cbd3e35baf (diff) | |
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23061 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/002-disable_rfkill.patch')
| -rw-r--r-- | package/mac80211/patches/002-disable_rfkill.patch | 4 |
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 20257972b..979435f55 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 |