summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-23 17:07:59 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-23 17:07:59 +0000
commit9fb445fa5320420ac3fe1461d62493a59f2aa462 (patch)
treef4829df724803472c15c7b205a1d784752194cd2
parente569cb2478bb80cbf7317f4a294e5b7ac675a387 (diff)
remove obsolete dependencies and checks
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19292 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/fs.mk2
-rw-r--r--package/kernel/modules/netdevices.mk4
-rw-r--r--package/kernel/modules/netsupport.mk2
-rw-r--r--package/kernel/modules/other.mk2
-rw-r--r--package/kernel/modules/usb.mk2
-rw-r--r--package/kernel/modules/wireless.mk47
6 files changed, 10 insertions, 49 deletions
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 84d482657d..fc1bd17d0d 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -355,7 +355,7 @@ define KernelPackage/fs-btrfs
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n
# for crc32c
- DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21&&!LINUX_2_6_25
+ DEPENDS:=+kmod-crypto-core
FILES:=\
$(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index b283855b0d..c15ce0fad9 100644
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -290,7 +290,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_30||LINUX_2_6_31:kmod-libphy @!TARGET_ubicom32
+ DEPENDS:=@LINUX_2_6 +kmod-libphy @!TARGET_ubicom32
SUBMENU:=$(NETWORK_DEVICES_MENU)
AUTOLOAD:=$(call AutoLoad,50,tg3)
endef
@@ -363,7 +363,7 @@ $(eval $(call KernelPackage,gigaset))
define KernelPackage/macvlan
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=MAC-VLAN support
- DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21
+ DEPENDS:=@LINUX_2_6
KCONFIG:=CONFIG_MACVLAN
FILES:=$(LINUX_DIR)/drivers/net/macvlan.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,macvlan)
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index e19afcc03f..21abc4c863 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pppoa))
define KernelPackage/pppol2tp
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=PPPoL2TP support
- DEPENDS:=kmod-ppp +kmod-pppoe @!LINUX_2_6_21||!LINUX_2_6_25
+ DEPENDS:=kmod-ppp +kmod-pppoe
KCONFIG:=CONFIG_PPPOL2TP
FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 73466bb2f1..f6c73c0490 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -788,7 +788,7 @@ $(eval $(call KernelPackage,cs5535-gpio))
define KernelPackage/textsearch
SUBMENU:=$(OTHER_MENU)
TITLE:=Textsearch support is selected if needed
- DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21
+ DEPENDS:=@LINUX_2_6
KCONFIG:= \
CONFIG_TEXTSEARCH=y \
CONFIG_TEXTSEARCH_KMP \
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index 08935d14a4..26ba652b61 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -634,7 +634,7 @@ $(eval $(call KernelPackage,usb-net-asix))
define KernelPackage/usb-net-hso
-$(call KernelPackage/usb-net/Depends,@LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_25 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill)
+$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill)
TITLE:=Kernel module for Option USB High Speed Mobile Devices
KCONFIG:=CONFIG_USB_HSO
FILES:= \
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 25e2286f16..95bab55a23 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -7,49 +7,10 @@
WIRELESS_MENU:=Wireless Drivers
-# NOTE: dependency on 2.6 was removed since it was inherited by kmod-hostap
-# and prevented it from even showing up in menuconfig on 2.4
-define KernelPackage/ieee80211
- SUBMENU:=$(WIRELESS_MENU)
- TITLE:=802.11 Networking stack
- DEPENDS:=+kmod-crypto-core kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic @LINUX_2_4||@LINUX_2_6_21||LINUX_2_6_25
- KCONFIG:= \
- CONFIG_IEEE80211 \
- CONFIG_IEEE80211_CRYPT_WEP \
- CONFIG_IEEE80211_CRYPT_CCMP \
- CONFIG_IEEE80211_CRYPT_TKIP
- FILES:= \
- $(LINUX_DIR)/net/ieee80211/ieee80211_crypt.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/ieee80211/ieee80211.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,10, \
- ieee80211_crypt \
- ieee80211 \
- ieee80211_crypt_wep \
- ieee80211_crypt_tkip \
- ieee80211_crypt_ccmp \
- )
-endef
-
-define KernelPackage/ieee80211/description
- Kernel modules for 802.11 Networking stack
- Includes:
- - ieee80211_crypt
- - ieee80211
- - ieee80211_crypt_wep
- - ieee80211_crypt_tkip
- - ieee80211_crytp_ccmp
-endef
-
-$(eval $(call KernelPackage,ieee80211))
-
-
define KernelPackage/lib80211
SUBMENU:=$(WIRELESS_MENU)
TITLE:=802.11 Networking stack
- DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32
+ DEPENDS:=@!LINUX_2_4
KCONFIG:= \
CONFIG_LIB80211 \
CONFIG_LIB80211_CRYPT_WEP \
@@ -83,7 +44,7 @@ $(eval $(call KernelPackage,lib80211))
define KernelPackage/net-libipw
SUBMENU:=$(WIRELESS_MENU)
TITLE:=libipw for ipw2100 and ipw2200
- DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32
+ DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211
KCONFIG:=CONFIG_LIBIPW
FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/libipw.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,49,libipw)
@@ -99,7 +60,7 @@ $(eval $(call KernelPackage,net-libipw))
define KernelPackage/net-ipw2100
SUBMENU:=$(WIRELESS_MENU)
TITLE:=Intel IPW2100 driver
- DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw
+ DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
KCONFIG:=CONFIG_IPW2100
FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/ipw2100.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2100)
@@ -117,7 +78,7 @@ $(eval $(call KernelPackage,net-ipw2100))
define KernelPackage/net-ipw2200
SUBMENU:=$(WIRELESS_MENU)
TITLE:=Intel IPW2200 driver
- DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw
+ DEPENDS:=@PCI_SUPPORT +kmod-net-libipw
KCONFIG:=CONFIG_IPW2200
FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/ipw2200.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2200)