summaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-01 17:42:00 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-01 17:42:00 +0000
commit0309435aa8cc62cb04bb7107fe850808c52a200e (patch)
tree2bdbe8183e9b8b8a211f5f5ee73536759da79874 /package/mac80211
parent9bd491e3a138bace7403370139cc600a98ea7456 (diff)
mac80211: move compat_firmware_class.ko into compat.ko (fixes #9864)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27863 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/Makefile8
-rw-r--r--package/mac80211/patches/050-compat_firmware.patch17
2 files changed, 17 insertions, 8 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index b7c0fe059..bc556f923 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -55,18 +55,10 @@ define KernelPackage/cfg80211
$(call KernelPackage/mac80211/Default)
TITLE:=cfg80211 - wireless configuration API
DEPENDS+= +wireless-tools +iw +crda
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1)
FILES:= \
$(PKG_BUILD_DIR)/compat/compat.ko \
$(PKG_BUILD_DIR)/net/wireless/cfg80211.ko
AUTOLOAD:=$(call AutoLoad,20,compat cfg80211)
-else
- FILES:= \
- $(PKG_BUILD_DIR)/compat/compat.ko \
- $(PKG_BUILD_DIR)/compat/compat_firmware_class.ko \
- $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko
- AUTOLOAD:=$(call AutoLoad,20,compat compat_firmware_class cfg80211)
-endif
endef
define KernelPackage/cfg80211/description
diff --git a/package/mac80211/patches/050-compat_firmware.patch b/package/mac80211/patches/050-compat_firmware.patch
new file mode 100644
index 000000000..4d96ca9f8
--- /dev/null
+++ b/package/mac80211/patches/050-compat_firmware.patch
@@ -0,0 +1,17 @@
+--- a/compat/Makefile
++++ b/compat/Makefile
+@@ -1,10 +1,13 @@
+ obj-m += compat.o
+ #compat-objs :=
+
+-obj-$(CONFIG_COMPAT_FIRMWARE_CLASS) += compat_firmware_class.o
+
+ compat-y += main.o
+
++ifdef CONFIG_COMPAT_FIRMWARE_CLASS
++ compat-y += compat_firmware_class.o
++endif
++
+ # Compat kernel compatibility code
+ compat-$(CONFIG_COMPAT_KERNEL_2_6_14) += compat-2.6.14.o
+ compat-$(CONFIG_COMPAT_KERNEL_2_6_18) += compat-2.6.18.o