qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 08:40:49 +02:00
Code

mac80211: move compat_firmware_class.ko into compat.ko (fixes #9864)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27863 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-08-01 17:42:00 +00:00
parent 9bd491e3a1
commit 0309435aa8
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/mac80211/Makefile
View File

@ -55,18 +55,10 @@ define KernelPackage/cfg80211
$(call KernelPackage/mac80211/Default) $(call KernelPackage/mac80211/Default)
TITLE:=cfg80211 - wireless configuration API TITLE:=cfg80211 - wireless configuration API
DEPENDS+= +wireless-tools +iw +crda DEPENDS+= +wireless-tools +iw +crda
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1)
FILES:= \ FILES:= \
$(PKG_BUILD_DIR)/compat/compat.ko \ $(PKG_BUILD_DIR)/compat/compat.ko \
$(PKG_BUILD_DIR)/net/wireless/cfg80211.ko $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko
AUTOLOAD:=$(call AutoLoad,20,compat cfg80211) 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 endef
define KernelPackage/cfg80211/description define KernelPackage/cfg80211/description

17
package/mac80211/patches/050-compat_firmware.patch Normal file
View File

@ -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