diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-26 13:31:42 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-26 13:31:42 +0000 |
| commit | 5dcf85bfaf290088306c7f944052abd9f2561f52 (patch) | |
| tree | 66277267e9f1b2562c38c1d021a604c4be2ecaf6 | |
| parent | b69ee884f40adfa49cb1d8f2056f337b7632e32c (diff) | |
[packages] fixes for kernel 2.6.31
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17739 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/hostap-driver/Makefile | 2 | ||||
| -rw-r--r-- | package/kernel/modules/netdevices.mk | 2 | ||||
| -rw-r--r-- | package/kernel/modules/wireless.mk | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/package/hostap-driver/Makefile b/package/hostap-driver/Makefile index 16dd468c3..cd1ca79ca 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:kmod-ieee80211 +LINUX_2_6_30:kmod-lib80211 +wireless-tools + 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 KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y PROVIDES:=kmod-hostap endef diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index 4f5cc1102..79e2abed1 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -289,7 +289,7 @@ define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_TIGON3 - DEPENDS:=@LINUX_2_6 +LINUX_2_6_27||LINUX_2_6_28||LINUX_2_6_30:kmod-libphy + DEPENDS:=@LINUX_2_6 +LINUX_2_6_27||LINUX_2_6_28||LINUX_2_6_30||LINUX_2_6_31:kmod-libphy SUBMENU:=$(NETWORK_DEVICES_MENU) AUTOLOAD:=$(call AutoLoad,50,tg3) endef diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index 04decad65..7965963e9 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 + DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31 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 + DEPENDS:=@PCI_SUPPORT +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31 KCONFIG:=CONFIG_LIBIPW FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)libipw.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,49,libipw) @@ -103,7 +103,7 @@ $(eval $(call KernelPackage,net-libipw)) define KernelPackage/net-ipw2100 SUBMENU:=$(WIRELESS_MENU) TITLE:=Intel IPW2100 driver - DEPENDS:=@PCI_SUPPORT +!LINUX_2_6_30:kmod-ieee80211 +LINUX_2_6_30:kmod-net-libipw + DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw KCONFIG:=CONFIG_IPW2100 FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)ipw2100.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ipw2100) @@ -121,7 +121,7 @@ $(eval $(call KernelPackage,net-ipw2100)) define KernelPackage/net-ipw2200 SUBMENU:=$(WIRELESS_MENU) TITLE:=Intel IPW2200 driver - DEPENDS:=@PCI_SUPPORT +!LINUX_2_6_30:kmod-ieee80211 +LINUX_2_6_30:kmod-net-libipw + DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw KCONFIG:=CONFIG_IPW2200 FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)ipw2200.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ipw2200) |