diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-12-05 12:54:30 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-12-05 12:54:30 +0000 |
| commit | 03ca3bf5bb3705674daef6e36fdcde79403d4ecd (patch) | |
| tree | 4fee5bdaa6a44f57eeceb0b0fb907e4ffb55b885 | |
| parent | d55e721178277e3d95e15733b8f4ee31a5411aee (diff) | |
| download | upstream-03ca3bf5bb3705674daef6e36fdcde79403d4ecd.tar.gz upstream-03ca3bf5bb3705674daef6e36fdcde79403d4ecd.tar.bz2 upstream-03ca3bf5bb3705674daef6e36fdcde79403d4ecd.zip | |
allow building hostap-driver and its dependencies on 2.6.32 (#6305)
SVN-Revision: 18658
| -rw-r--r-- | package/hostap-driver/Makefile | 2 | ||||
| -rw-r--r-- | package/kernel/modules/wireless.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/hostap-driver/Makefile b/package/hostap-driver/Makefile index cd1ca79ca2..6841fcdc0c 100644 --- a/package/hostap-driver/Makefile +++ b/package/hostap-driver/Makefile @@ -45,7 +45,7 @@ endef define KernelPackage/hostap $(call KernelPackage/hostap/Default) TITLE:=Host AP support for Prism2/2.5/3 - DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-lib80211 +wireless-tools + DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32:kmod-lib80211 +wireless-tools KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y PROVIDES:=kmod-hostap endef diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index 609e04bf8b..27ecfb6f74 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -49,7 +49,7 @@ $(eval $(call KernelPackage,ieee80211)) define KernelPackage/lib80211 SUBMENU:=$(WIRELESS_MENU) TITLE:=802.11 Networking stack - DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31 + DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32 KCONFIG:= \ CONFIG_LIB80211 \ CONFIG_LIB80211_CRYPT_WEP \ @@ -87,7 +87,7 @@ endif define KernelPackage/net-libipw SUBMENU:=$(WIRELESS_MENU) TITLE:=libipw for ipw2100 and ipw2200 - DEPENDS:=@PCI_SUPPORT +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31 + DEPENDS:=@PCI_SUPPORT +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32 KCONFIG:=CONFIG_LIBIPW FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)libipw.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,49,libipw) |