From 38c1e4d5bf113c67214e52053d7fe6fe9d317a1e Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 29 Apr 2010 04:04:19 +0000 Subject: package/kernel: move AddDepends calls at the end of package definitions, move back some dependencies in DEPENDS for clarity git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21248 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/block.mk | 31 +++++---- package/kernel/modules/crypto.mk | 40 ++++++----- package/kernel/modules/hwmon.mk | 15 +++-- package/kernel/modules/netfilter.mk | 46 ++++++------- package/kernel/modules/nls.mk | 26 +++---- package/kernel/modules/sound.mk | 8 +-- package/kernel/modules/usb.mk | 131 ++++++++++++++++++++++-------------- package/kernel/modules/video.mk | 76 ++++++++++++--------- package/kernel/modules/w1.mk | 12 ++-- 9 files changed, 219 insertions(+), 166 deletions(-) diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index f1074251ab..6ffda26f88 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -41,11 +41,11 @@ endef define KernelPackage/ata-ahci -$(call AddDepends/ata) TITLE:=AHCI Serial ATA support KCONFIG:=CONFIG_SATA_AHCI FILES:=$(LINUX_DIR)/drivers/ata/ahci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,ahci,1) + $(call AddDepends/ata) endef define KernelPackage/ata-ahci/description @@ -56,11 +56,11 @@ $(eval $(call KernelPackage,ata-ahci)) define KernelPackage/ata-artop -$(call AddDepends/ata,) TITLE:=ARTOP 6210/6260 PATA support KCONFIG:=CONFIG_PATA_ARTOP FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,pata_artop,1) + $(call AddDepends/ata) endef define KernelPackage/ata-artop/description @@ -71,11 +71,11 @@ $(eval $(call KernelPackage,ata-artop)) define KernelPackage/ata-nvidia-sata -$(call AddDepends/ata,) TITLE:=Nvidia Serial ATA support KCONFIG:=CONFIG_SATA_NV FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,sata_nv,1) + $(call AddDepends/ata) endef $(eval $(call KernelPackage,ata-nvidia-sata)) @@ -101,11 +101,11 @@ $(eval $(call KernelPackage,ata-pdc202xx-old)) define KernelPackage/ata-piix -$(call AddDepends/ata,) TITLE:=Intel PIIX PATA/SATA support KCONFIG:=CONFIG_ATA_PIIX FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,ata_piix,1) + $(call AddDepends/ata) endef define KernelPackage/ata-piix/description @@ -117,11 +117,11 @@ $(eval $(call KernelPackage,ata-piix)) define KernelPackage/ata-sil -$(call AddDepends/ata,) TITLE:=Silicon Image SATA support KCONFIG:=CONFIG_SATA_SIL FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,sata_sil,1) + $(call AddDepends/ata) endef define KernelPackage/ata-sil/description @@ -132,11 +132,11 @@ $(eval $(call KernelPackage,ata-sil)) define KernelPackage/ata-sil24 -$(call AddDepends/ata,) TITLE:=Silicon Image 3124/3132 SATA support KCONFIG:=CONFIG_SATA_SIL24 FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1) + $(call AddDepends/ata) endef define KernelPackage/ata-sil24/description @@ -147,11 +147,11 @@ $(eval $(call KernelPackage,ata-sil24)) define KernelPackage/ata-via-sata -$(call AddDepends/ata,) TITLE:=VIA SATA support KCONFIG:=CONFIG_SATA_VIA FILES:=$(LINUX_DIR)/drivers/ata/sata_via.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,sata_via,1) + $(call AddDepends/ata) endef define KernelPackage/ata-via-sata/description @@ -249,15 +249,16 @@ $(eval $(call KernelPackage,ide-core)) define AddDepends/ide SUBMENU:=$(BLOCK_MENU) - DEPENDS:=kmod-ide-core $(1) + DEPENDS+=kmod-ide-core $(1) endef define KernelPackage/ide-generic -$(call AddDepends/ide,@PCI_SUPPORT) SUBMENU:=$(BLOCK_MENU) + DEPENDS:=@PCI_SUPPORT TITLE:=Kernel support for generic PCI IDE chipsets KCONFIG:=CONFIG_BLK_DEV_GENERIC + $(call AddDepends/ide) endef define KernelPackage/ide-generic/2.4 @@ -278,23 +279,25 @@ $(eval $(call KernelPackage,ide-generic)) define KernelPackage/ide-generic-old -$(call AddDepends/ide,@LINUX_2_6) SUBMENU:=$(BLOCK_MENU) + DEPENDS:=@LINUX_2_6 TITLE:=Kernel support for generic (legacy) IDE chipsets KCONFIG:=CONFIG_IDE_GENERIC FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,ide-generic,1) + $(call AddDepends/ide) endef $(eval $(call KernelPackage,ide-generic-old)) define KernelPackage/ide-aec62xx -$(call AddDepends/ide,@PCI_SUPPORT) TITLE:=Acard AEC62xx IDE driver + DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_AEC62XX FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,aec62xx,1) + $(call AddDepends/ide) endef define KernelPackage/ide-aec62xx/2.4 @@ -309,11 +312,12 @@ $(eval $(call KernelPackage,ide-aec62xx,1)) define KernelPackage/ide-pdc202xx -$(call AddDepends/ide,@PCI_SUPPORT) TITLE:=Promise PDC202xx IDE driver + DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old,1) + $(call AddDepends/ide) endef define KernelPackage/ide-pdc202xx/2.4 @@ -329,11 +333,12 @@ $(eval $(call KernelPackage,ide-pdc202xx)) define KernelPackage/ide-it821x -$(call AddDepends/ide,@PCI_SUPPORT) TITLE:=ITE IT821x IDE driver + DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_IT821X FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,it821x,1) + $(call AddDepends/ide) endef define KernelPackage/ide-it821x/description diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 3f9259bf3c..859e8a563e 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -58,12 +58,11 @@ $(eval $(call KernelPackage,crypto-core)) define AddDepends/crypto SUBMENU:=$(CRYPTO_MENU) - DEPENDS:=kmod-crypto-core $(1) + DEPENDS+=kmod-crypto-core $(1) endef define KernelPackage/crypto-hw-padlock -$(call AddDepends/crypto,) TITLE:=VIA PadLock ACE with AES/SHA hw crypto module KCONFIG:= \ CONFIG_CRYPTO_HW=y \ @@ -74,27 +73,28 @@ $(call AddDepends/crypto,) $(LINUX_DIR)/drivers/crypto/padlock-aes.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/crypto/padlock-sha.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,padlock-aes padlock-sha) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-hw-padlock)) define KernelPackage/crypto-hw-geode -$(call AddDepends/crypto,) TITLE:=AMD Geode hardware crypto module KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_GEODE FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,geode-aes) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-hw-geode)) define KernelPackage/crypto-hw-hifn-795x -$(call AddDepends/crypto,+kmod-crypto-des @!TARGET_ubicom32) TITLE:=HIFN 795x crypto accelerator + DEPENDS:=@!TARGET_ubicom32 KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_HW_RANDOM=y \ @@ -102,19 +102,21 @@ $(call AddDepends/crypto,+kmod-crypto-des @!TARGET_ubicom32) CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,hifn_795x) + $(call AddDepends/crypto,+kmod-crypto-des) endef $(eval $(call KernelPackage,crypto-hw-hifn-795x)) define KernelPackage/crypto-hw-ixp4xx -$(call AddDepends/crypto,@TARGET_ixp4xx +kmod-crypto-des +kmod-crypto-authenc) TITLE:=Intel IXP4xx hardware crypto module + DEPENDS:=@TARGET_ixp4xx KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_IXP4XX FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) + $(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des) endef define KernelPackage/crypto-hw-ixp4xx/description @@ -125,13 +127,14 @@ $(eval $(call KernelPackage,crypto-hw-ixp4xx)) define KernelPackage/crypto-hw-ppc4xx -$(call AddDepends/crypto,@TARGET_ppc40x||TARGET_ppc44x) TITLE:=AMCC PPC4xx hardware crypto module + DEPENDS:=@TARGET_ppc40x||TARGET_ppc44x KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PPC4XX FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,crypto4xx) + $(call AddDepends/crypto) endef define KernelPackage/crypto-hw-ppc4xx/description @@ -142,11 +145,11 @@ $(eval $(call KernelPackage,crypto-hw-ppc4xx)) define KernelPackage/crypto-aes -$(call AddDepends/crypto,) TITLE:=AES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX)) + $(call AddDepends/crypto) endef define KernelPackage/crypto-aes/x86 @@ -158,83 +161,82 @@ $(eval $(call KernelPackage,crypto-aes)) define KernelPackage/crypto-arc4 -$(call AddDepends/crypto,) TITLE:=ARC4 (RC4) cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_ARC4 FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,arc4) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-arc4)) define KernelPackage/crypto-authenc -$(call AddDepends/crypto,) TITLE:=Combined mode wrapper for IPsec KCONFIG:=CONFIG_CRYPTO_AUTHENC FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,authenc) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-authenc)) define KernelPackage/crypto-des -$(call AddDepends/crypto,) TITLE:=DES/3DES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_DES FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX)) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-hmac -$(call AddDepends/crypto,) TITLE:=HMAC digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_HMAC FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,hmac) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-md5 -$(call AddDepends/crypto,) TITLE:=MD5 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MD5 FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,md5) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-md5)) define KernelPackage/crypto-michael-mic -$(call AddDepends/crypto,) TITLE:=Michael MIC keyed digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC FILES:=$(LINUX_DIR)/crypto/michael_mic.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,michael_mic) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 -$(call AddDepends/crypto,) TITLE:=SHA1 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_SHA1 FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX)) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-sha1)) define KernelPackage/crypto-misc -$(call AddDepends/crypto,) TITLE:=Other CryptoAPI modules KCONFIG:= \ CONFIG_CRYPTO_ANUBIS \ @@ -268,6 +270,7 @@ $(call AddDepends/crypto,) $(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX) + $(call AddDepends/crypto) endef define KernelPackage/crypto-misc/2.6 @@ -287,8 +290,8 @@ $(eval $(call KernelPackage,crypto-misc)) define KernelPackage/crypto-ocf -$(call AddDepends/crypto,@!TARGET_uml +@OPENSSL_ENGINE) TITLE:=OCF modules + DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml KCONFIG:= \ CONFIG_OCF_OCF \ CONFIG_OCF_CRYPTODEV \ @@ -304,27 +307,28 @@ $(call AddDepends/crypto,@!TARGET_uml +@OPENSSL_ENGINE) cryptodev \ cryptosoft \ ) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-ocf)) define KernelPackage/crypto-null -$(call AddDepends/crypto,) TITLE:=Null CryptoAPI module KCONFIG:=CONFIG_CRYPTO_NULL FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,crypto_null) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-null)) define KernelPackage/crypto-test -$(call AddDepends/crypto,) TITLE:=Test CryptoAPI module KCONFIG:=CONFIG_CRYPTO_TEST FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-test)) diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk index bd008fd094..e97b9f8d21 100644 --- a/package/kernel/modules/hwmon.mk +++ b/package/kernel/modules/hwmon.mk @@ -33,11 +33,11 @@ endef define KernelPackage/hwmon-lm75 -$(call AddDepends/hwmon,+kmod-i2c-core) TITLE:=LM75 monitoring support KCONFIG:=CONFIG_SENSORS_LM75 FILES:=$(LINUX_DIR)/drivers/hwmon/lm75.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,lm75) + $(call AddDepends/hwmon,+kmod-i2c-core) endef define KernelPackage/hwmon-lm75/description @@ -48,11 +48,11 @@ $(eval $(call KernelPackage,hwmon-lm75)) define KernelPackage/hwmon-lm77 -$(call AddDepends/hwmon,+kmod-i2c-core) TITLE:=LM77 monitoring support KCONFIG:=CONFIG_SENSORS_LM77 FILES:=$(LINUX_DIR)/drivers/hwmon/lm77.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,lm77) + $(call AddDepends/hwmon,+kmod-i2c-core) endef define KernelPackage/hwmon-lm77/description @@ -61,12 +61,13 @@ endef $(eval $(call KernelPackage,hwmon-lm77)) + define KernelPackage/hwmon-lm90 -$(call AddDepends/hwmon,+kmod-i2c-core) TITLE:=LM90 monitoring support KCONFIG:=CONFIG_SENSORS_LM90 FILES:=$(LINUX_DIR)/drivers/hwmon/lm90.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,lm90) + $(call AddDepends/hwmon,+kmod-i2c-core) endef define KernelPackage/hwmon-lm90/description @@ -75,9 +76,10 @@ endef $(eval $(call KernelPackage,hwmon-lm90)) + define KernelPackage/hwmon-pc87360 -$(call AddDepends/hwmon,@TARGET_x86) TITLE:=PC87360 monitoring support + DEPENDS:=@TARGET_x86 KCONFIG:= \ CONFIG_SENSORS_PC87360 \ CONFIG_HWMON_VID @@ -85,6 +87,7 @@ $(call AddDepends/hwmon,@TARGET_x86) $(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,hwmon-vid pc87360) + $(call AddDepends/hwmon) endef define KernelPackage/hwmon-pc87360/description @@ -93,9 +96,10 @@ endef $(eval $(call KernelPackage,hwmon-pc87360)) + define KernelPackage/hwmon-w83627hf -$(call AddDepends/hwmon,@TARGET_rdc||TARGET_x86) TITLE:=Winbond W83627HF monitoring support + DEPENDS:=@TARGET_rdc||TARGET_x86 KCONFIG:= \ CONFIG_SENSORS_W83627HF \ CONFIG_HWMON_VID @@ -103,6 +107,7 @@ $(call AddDepends/hwmon,@TARGET_rdc||TARGET_x86) $(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/hwmon/w83627hf.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,hwmon-vid w83627hf) +$(call AddDepends/hwmon) endef define KernelPacakge/hwmon-w83627hf/description diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index f499445144..73b59773b4 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -35,16 +35,16 @@ $(eval $(call KernelPackage,ipt-core)) define AddDepends/ipt SUBMENU:=$(NF_MENU) - DEPENDS:= kmod-ipt-core $(1) + DEPENDS+= kmod-ipt-core $(1) endef define KernelPackage/ipt-conntrack -$(call AddDepends/ipt,) TITLE:=Basic connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK) FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,41,$(notdir $(IPT_CONNTRACK-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-conntrack/description @@ -61,11 +61,11 @@ $(eval $(call KernelPackage,ipt-conntrack)) define KernelPackage/ipt-conntrack-extra -$(call AddDepends/ipt,+kmod-ipt-conntrack) TITLE:=Extra connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA) FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_CONNTRACK_EXTRA-m))) + $(call AddDepends/ipt,+kmod-ipt-conntrack) endef define KernelPackage/ipt-conntrack-extra/description @@ -82,11 +82,11 @@ $(eval $(call KernelPackage,ipt-conntrack-extra)) define KernelPackage/ipt-filter -$(call AddDepends/ipt,+LINUX_2_6:kmod-textsearch) TITLE:=Modules for packet content inspection KCONFIG:=$(KCONFIG_IPT_FILTER) FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m))) + $(call AddDepends/ipt,+LINUX_2_6:kmod-textsearch) endef define KernelPackage/ipt-filter/description @@ -100,11 +100,11 @@ $(eval $(call KernelPackage,ipt-filter)) define KernelPackage/ipt-ipopt -$(call AddDepends/ipt,) TITLE:=Modules for matching/changing IP packet options KCONFIG:=$(KCONFIG_IPT_IPOPT) FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPOPT-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-ipopt/description @@ -128,11 +128,11 @@ $(eval $(call KernelPackage,ipt-ipopt)) define KernelPackage/ipt-ipsec -$(call AddDepends/ipt,) TITLE:=Modules for matching IPSec packets KCONFIG:=$(KCONFIG_IPT_IPSEC) FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSEC-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-ipsec/description @@ -147,11 +147,11 @@ $(eval $(call KernelPackage,ipt-ipsec)) define KernelPackage/ipt-nat -$(call AddDepends/ipt,+kmod-ipt-conntrack) TITLE:=Basic NAT targets KCONFIG:=$(KCONFIG_IPT_NAT) FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_NAT-m))) + $(call AddDepends/ipt,+kmod-ipt-conntrack) endef define KernelPackage/ipt-nat/description @@ -164,11 +164,11 @@ $(eval $(call KernelPackage,ipt-nat)) define KernelPackage/ipt-nat-extra -$(call AddDepends/ipt,+kmod-ipt-nat) TITLE:=Extra NAT targets KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA) FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT_EXTRA-m))) + $(call AddDepends/ipt,+kmod-ipt-nat) endef define KernelPackage/ipt-nat-extra/description @@ -183,11 +183,11 @@ $(eval $(call KernelPackage,ipt-nat-extra)) define KernelPackage/ipt-nathelper -$(call AddDepends/ipt,+kmod-ipt-nat) TITLE:=Basic Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER) FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER-m))) + $(call AddDepends/ipt,+kmod-ipt-nat) endef define KernelPackage/ipt-nathelper/description @@ -202,11 +202,11 @@ $(eval $(call KernelPackage,ipt-nathelper)) define KernelPackage/ipt-nathelper-extra -$(call AddDepends/ipt,+kmod-ipt-nat +LINUX_2_6:kmod-textsearch) TITLE:=Extra Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA) FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m))) + $(call AddDepends/ipt,+kmod-ipt-nat +LINUX_2_6:kmod-textsearch) endef define KernelPackage/ipt-nathelper-extra/description @@ -226,7 +226,6 @@ $(eval $(call KernelPackage,ipt-nathelper-extra)) define KernelPackage/ipt-imq -$(call AddDepends/ipt,) TITLE:=Intermediate Queueing support KCONFIG:= \ CONFIG_IMQ \ @@ -240,6 +239,7 @@ $(call AddDepends/ipt,) imq \ $(IPT_IMQ-m) \ )) + $(call AddDepends/ipt) endef define KernelPackage/ipt-imq/description @@ -250,11 +250,11 @@ $(eval $(call KernelPackage,ipt-imq)) define KernelPackage/ipt-queue -$(call AddDepends/ipt,) TITLE:=Module for user-space packet queueing KCONFIG:=$(KCONFIG_IPT_QUEUE) FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-queue/description @@ -267,11 +267,11 @@ $(eval $(call KernelPackage,ipt-queue)) define KernelPackage/ipt-ulog -$(call AddDepends/ipt,) TITLE:=Module for user-space packet logging KCONFIG:=$(KCONFIG_IPT_ULOG) FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_ULOG-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-ulog/description @@ -284,11 +284,11 @@ $(eval $(call KernelPackage,ipt-ulog)) define KernelPackage/ipt-iprange -$(call AddDepends/ipt,) TITLE:=Module for matching ip ranges KCONFIG:=$(KCONFIG_IPT_IPRANGE) FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPRANGE-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-iprange/description @@ -301,11 +301,11 @@ $(eval $(call KernelPackage,ipt-iprange)) define KernelPackage/ipt-extra -$(call AddDepends/ipt,) TITLE:=Extra modules KCONFIG:=$(KCONFIG_IPT_EXTRA) FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_EXTRA-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-extra/description @@ -375,16 +375,16 @@ $(eval $(call KernelPackage,ebtables)) define AddDepends/ebtables SUBMENU:=$(NF_MENU) - DEPENDS:=kmod-ebtables $(1) + DEPENDS+=kmod-ebtables $(1) endef define KernelPackage/ebtables-ipv4 -$(call AddDepends/ebtables,) TITLE:=ebtables: IPv4 support FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_IP4) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP4-m))) + $(call AddDepends/ebtables) endef define KernelPackage/ebtables-ipv4/description @@ -396,11 +396,11 @@ $(eval $(call KernelPackage,ebtables-ipv4)) define KernelPackage/ebtables-ipv6 -$(call AddDepends/ebtables,) TITLE:=ebtables: IPv6 support FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_IP6) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP6-m))) + $(call AddDepends/ebtables) endef define KernelPackage/ebtables-ipv6/description @@ -412,11 +412,11 @@ $(eval $(call KernelPackage,ebtables-ipv6)) define KernelPackage/ebtables-watchers -$(call AddDepends/ebtables,) TITLE:=ebtables: watchers support FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_WATCHERS-m))) + $(call AddDepends/ebtables) endef define KernelPackage/ebtables-watchers/description @@ -445,16 +445,16 @@ $(eval $(call KernelPackage,nfnetlink)) define AddDepends/nfnetlink SUBMENU:=$(NF_MENU) - DEPENDS:=@LINUX_2_6 +kmod-nfnetlink $(1) + DEPENDS+=@LINUX_2_6 +kmod-nfnetlink $(1) endef define KernelPackage/nfnetlink-log -$(call AddDepends/nfnetlink,) TITLE:=Netfilter LOG over NFNETLINK interface FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NETFILTER_NETLINK_LOG AUTOLOAD:=$(call AutoLoad,48,nfnetlink_log) + $(call AddDepends/nfnetlink) endef define KernelPackage/nfnetlink-log/description @@ -465,11 +465,11 @@ $(eval $(call KernelPackage,nfnetlink-log)) define KernelPackage/nfnetlink-queue -$(call AddDepends/nfnetlink,) TITLE:=Netfilter QUEUE over NFNETLINK interface FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NETFILTER_NETLINK_QUEUE AUTOLOAD:=$(call AutoLoad,48,nfnetlink_queue) + $(call AddDepends/nfnetlink) endef define KernelPackage/nfnetlink-queue/description @@ -480,11 +480,11 @@ $(eval $(call KernelPackage,nfnetlink-queue)) define KernelPackage/nf-conntrack-netlink -$(call AddDepends/nfnetlink,+kmod-ipt-conntrack) TITLE:=Connection tracking netlink interface FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NF_CT_NETLINK AUTOLOAD:=$(call AutoLoad,49,nf_conntrack_netlink) + $(call AddDepends/nfnetlink,+kmod-ipt-conntrack) endef define KernelPackage/nf-conntrack-netlink/description diff --git a/package/kernel/modules/nls.mk b/package/kernel/modules/nls.mk index f65be7700a..26d55d9870 100644 --- a/package/kernel/modules/nls.mk +++ b/package/kernel/modules/nls.mk @@ -30,7 +30,7 @@ define KernelPackage/nls-cp437 KCONFIG:=CONFIG_NLS_CODEPAGE_437 FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp437) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-cp437/description @@ -46,7 +46,7 @@ define KernelPackage/nls-cp775 KCONFIG:=CONFIG_NLS_CODEPAGE_775 FILES:=$(LINUX_DIR)/fs/nls/nls_cp775.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp775) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-cp775/description @@ -62,7 +62,7 @@ define KernelPackage/nls-cp850 KCONFIG:=CONFIG_NLS_CODEPAGE_850 FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp850) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-cp850/description @@ -78,7 +78,7 @@ define KernelPackage/nls-cp852 KCONFIG:=CONFIG_NLS_CODEPAGE_852 FILES:=$(LINUX_DIR)/fs/nls/nls_cp852.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp852) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-cp852/description @@ -94,7 +94,7 @@ define KernelPackage/nls-cp866 KCONFIG:=CONFIG_NLS_CODEPAGE_866 FILES:=$(LINUX_DIR)/fs/nls/nls_cp866.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp866) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-cp866/description @@ -110,7 +110,7 @@ define KernelPackage/nls-cp1250 KCONFIG:=CONFIG_NLS_CODEPAGE_1250 FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp1250) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-cp1250/description @@ -126,7 +126,7 @@ define KernelPackage/nls-cp1251 KCONFIG:=CONFIG_NLS_CODEPAGE_1251 FILES:=$(LINUX_DIR)/fs/nls/nls_cp1251.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp1251) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-cp1251/description @@ -142,7 +142,7 @@ define KernelPackage/nls-iso8859-1 KCONFIG:=CONFIG_NLS_ISO8859_1 FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-iso8859-1/description @@ -158,7 +158,7 @@ define KernelPackage/nls-iso8859-2 KCONFIG:=CONFIG_NLS_ISO8859_2 FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-iso8859-2/description @@ -174,7 +174,7 @@ define KernelPackage/nls-iso8859-13 KCONFIG:=CONFIG_NLS_ISO8859_13 FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-13.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-13) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-iso8859-13/description @@ -190,7 +190,7 @@ define KernelPackage/nls-iso8859-15 KCONFIG:=CONFIG_NLS_ISO8859_15 FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-iso8859-15/description @@ -206,7 +206,7 @@ define KernelPackage/nls-koi8r KCONFIG:=CONFIG_NLS_KOI8_R FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-koi8r/description @@ -222,7 +222,7 @@ define KernelPackage/nls-utf8 KCONFIG:=CONFIG_NLS_UTF8 FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_utf8) -$(call AddDepends/nls) + $(call AddDepends/nls) endef define KernelPackage/nls-utf8/description diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index ef6b0a9daf..8a1b4ef63c 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -96,16 +96,16 @@ $(eval $(call KernelPackage,sound-core)) define AddDepends/sound SUBMENU:=$(SOUND_MENU) - DEPENDS:=kmod-sound-core $(1) + DEPENDS+=kmod-sound-core $(1) @!TARGET_uml endef define KernelPackage/sound-i8x0 -$(call AddDepends/sound,@!TARGET_uml) TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller KCONFIG:=CONFIG_SND_INTEL8X0 FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,35,snd-i8x0) + $(call AddDepends/sound) endef define KernelPackage/sound-i8x0/description @@ -118,13 +118,13 @@ $(eval $(call KernelPackage,sound-i8x0)) define KernelPackage/sound-cs5535audio -$(call AddDepends/sound,@!TARGET_uml) TITLE:=CS5535 PCI Controller KCONFIG:=CONFIG_SND_CS5535AUDIO FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/sound/ac97_bus.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,35, ac97_bus snd-ac97-codec snd-cs5535audio) + $(call AddDepends/sound) endef define KernelPackage/sound-cs5535audio/description @@ -135,13 +135,13 @@ $(eval $(call KernelPackage,sound-cs5535audio)) define KernelPackage/sound-soc-core -$(call AddDepends/sound) TITLE:=SoC sound support KCONFIG:= \ CONFIG_SND_SOC \ CONFIG_SND_SOC_ALL_CODECS=n FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko AUTOLOAD:=$(call AutoLoad,55, snd-soc-core) + $(call AddDepends/sound) endef $(eval $(call KernelPackage,sound-soc-core)) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 9a2b046de5..ac879fc1fa 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -40,16 +40,16 @@ $(eval $(call KernelPackage,usb-core)) define AddDepends/usb SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-core $(1) + DEPENDS+=kmod-usb-core $(1) endef define KernelPackage/usb-uhci -$(call AddDepends/usb,) TITLE:=Support for UHCI controllers KCONFIG:= \ CONFIG_USB_UHCI_ALT \ CONFIG_USB_UHCI_HCD + $(call AddDepends/usb) endef define KernelPackage/usb-uhci/2.4 @@ -72,11 +72,12 @@ $(eval $(call KernelPackage,usb-uhci,1)) define KernelPackage/usb-uhci-iv -$(call AddDepends/usb,@LINUX_2_4) TITLE:=Support for Intel/VIA UHCI controllers + DEPENDS:=@LINUX_2_4 KCONFIG:=CONFIG_USB_UHCI FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,usb-uhci,1) + $(call AddDepends/usb) endef define KernelPackage/usb-uhci-iv/description @@ -87,12 +88,12 @@ $(eval $(call KernelPackage,usb-uhci-iv,1)) define KernelPackage/usb-ohci -$(call AddDepends/usb,) TITLE:=Support for OHCI controllers KCONFIG:= \ CONFIG_USB_OHCI \ CONFIG_USB_OHCI_HCD \ CONFIG_USB_OHCI_AR71XX=y + $(call AddDepends/usb) endef define KernelPackage/usb-ohci/2.4 @@ -115,14 +116,15 @@ $(eval $(call KernelPackage,usb-ohci,1)) define KernelPackage/usb-isp116x-hcd -$(call AddDepends/usb,@TARGET_ppc40x) TITLE:=Support for the ISP116x USB Host Controller + DEPENDS:=@TARGET_ppc40x KCONFIG:= \ CONFIG_USB_ISP116X_HCD \ CONFIG_USB_ISP116X_HCD_OF=y \ CONFIG_USB_ISP116X_HCD_PLATFORM=n FILES:=$(LINUX_DIR)/drivers/usb/host/isp116x-hcd.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,isp116x-hcd) + $(call AddDepends/usb) endef define KernelPackage/usb-isp116x-hcd/description @@ -133,12 +135,12 @@ $(eval $(call KernelPackage,usb-isp116x-hcd)) define KernelPackage/usb2 -$(call AddDepends/usb,) TITLE:=Support for USB2 controllers KCONFIG:=CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_AR71XX=y FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1) + $(call AddDepends/usb) endef define KernelPackage/usb2/description @@ -149,9 +151,9 @@ $(eval $(call KernelPackage,usb2)) define KernelPackage/usb-acm -$(call AddDepends/usb,) TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM +$(call AddDepends/usb) endef define KernelPackage/usb-acm/2.4 @@ -172,11 +174,12 @@ $(eval $(call KernelPackage,usb-acm)) define KernelPackage/usb-audio -$(call AddDepends/usb,+kmod-sound-core) TITLE:=Support for USB audio devices KCONFIG:= \ CONFIG_USB_AUDIO \ CONFIG_SND_USB_AUDIO + $(call AddDepends/usb) + $(call AddDepends/sound) endef define KernelPackage/usb-audio/2.4 @@ -201,9 +204,9 @@ $(eval $(call KernelPackage,usb-audio)) define KernelPackage/usb-printer -$(call AddDepends/usb,) TITLE:=Support for printers KCONFIG:=CONFIG_USB_PRINTER + $(call AddDepends/usb) endef define KernelPackage/usb-printer/2.4 @@ -224,11 +227,11 @@ $(eval $(call KernelPackage,usb-printer)) define KernelPackage/usb-serial -$(call AddDepends/usb,) TITLE:=Support for USB-to-Serial converters KCONFIG:=CONFIG_USB_SERIAL FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,usbserial) + $(call AddDepends/usb) endef define KernelPackage/usb-serial/description @@ -240,16 +243,17 @@ $(eval $(call KernelPackage,usb-serial)) define AddDepends/usb-serial SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-serial $(1) + DEPENDS+=kmod-usb-serial $(1) endef define KernelPackage/usb-serial-airprime -$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for Airprime (EVDO) + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,airprime) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-airprime/description @@ -260,11 +264,11 @@ $(eval $(call KernelPackage,usb-serial-airprime)) define KernelPackage/usb-serial-belkin -$(call AddDepends/usb-serial,) TITLE:=Support for Belkin devices KCONFIG:=CONFIG_USB_SERIAL_BELKIN FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,belkin_sa) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-belkin/description @@ -275,11 +279,12 @@ $(eval $(call KernelPackage,usb-serial-belkin)) define KernelPackage/usb-serial-ch341 -$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for CH341 devices + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_CH341 FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,ch341) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-belkin/description @@ -290,11 +295,11 @@ $(eval $(call KernelPackage,usb-serial-ch341)) define KernelPackage/usb-serial-ftdi -$(call AddDepends/usb-serial,) TITLE:=Support for FTDI devices KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,ftdi_sio) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-ftdi/description @@ -305,11 +310,11 @@ $(eval $(call KernelPackage,usb-serial-ftdi)) define KernelPackage/usb-serial-mct -$(call AddDepends/usb-serial,) TITLE:=Support for Magic Control Tech. devices KCONFIG:=CONFIG_USB_SERIAL_MCT_U232 FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,mct_u232) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-mct/description @@ -320,11 +325,11 @@ $(eval $(call KernelPackage,usb-serial-mct)) define KernelPackage/usb-serial-pl2303 -$(call AddDepends/usb-serial,) TITLE:=Support for Prolific PL2303 devices KCONFIG:=CONFIG_USB_SERIAL_PL2303 FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,pl2303) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-pl2303/description @@ -335,11 +340,11 @@ $(eval $(call KernelPackage,usb-serial-pl2303)) define KernelPackage/usb-serial-cp210x -$(call AddDepends/usb-serial,) TITLE:=Support for Silicon Labs cp210x devices KCONFIG:=CONFIG_USB_SERIAL_CP210X FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,cp210x) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-cp210x/description @@ -350,11 +355,12 @@ $(eval $(call KernelPackage,usb-serial-cp210x)) define KernelPackage/usb-serial-ark3116 -$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for ArkMicroChips ARK3116 devices + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_ARK3116 FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,ark3116) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-ark3116/description @@ -365,11 +371,12 @@ $(eval $(call KernelPackage,usb-serial-ark3116)) define KernelPackage/usb-serial-oti6858 -$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for Ours Technology OTI6858 devices + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_OTI6858 FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,oti6858) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-oti6858/description @@ -380,11 +387,11 @@ $(eval $(call KernelPackage,usb-serial-oti6858)) define KernelPackage/usb-serial-sierrawireless -$(call AddDepends/usb-serial,) TITLE:=Support for Sierra Wireless devices KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,sierra) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-sierrawireless/description @@ -395,11 +402,11 @@ $(eval $(call KernelPackage,usb-serial-sierrawireless)) define KernelPackage/usb-serial-motorola-phone -$(call AddDepends/usb-serial,) TITLE:=Support for Motorola usb phone KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,moto_modem) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-motorola-phone/description @@ -409,13 +416,12 @@ endef $(eval $(call KernelPackage,usb-serial-motorola-phone)) - define KernelPackage/usb-serial-visor -$(call AddDepends/usb-serial,) TITLE:=Support for Handspring Visor devices KCONFIG:=CONFIG_USB_SERIAL_VISOR FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,visor) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-visor/description @@ -426,11 +432,11 @@ $(eval $(call KernelPackage,usb-serial-visor)) define KernelPackage/usb-serial-cypress-m8 -$(call AddDepends/usb-serial,) TITLE:=Support for CypressM8 USB-Serial KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8 FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,cypress_m8) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-cypress-m8/description @@ -444,7 +450,6 @@ $(eval $(call KernelPackage,usb-serial-cypress-m8)) define KernelPackage/usb-serial-keyspan -$(call AddDepends/usb-serial,) TITLE:=Support for Keyspan USB-to-Serial devices KCONFIG:= \ CONFIG_USB_SERIAL_KEYSPAN \ @@ -462,6 +467,7 @@ $(call AddDepends/usb-serial,) CONFIG_USB_SERIAL_KEYSPAN_USA49WLC FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,keyspan) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-keyspan/description @@ -472,11 +478,12 @@ $(eval $(call KernelPackage,usb-serial-keyspan)) define KernelPackage/usb-serial-option -$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for Option HSDPA modems + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_OPTION FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,option) + $(call AddDepends/usb-serial) endef define KernelPackage/usb-serial-option/description @@ -487,11 +494,12 @@ $(eval $(call KernelPackage,usb-serial-option)) define KernelPackage/usb-storage -$(call AddDepends/usb,+!TARGET_x86:kmod-scsi-core) TITLE:=USB Storage support + DEPENDS:= +!TARGET_x86:kmod-scsi-core KCONFIG:=CONFIG_USB_STORAGE FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,usb-storage,1) + $(call AddDepends/usb) endef define KernelPackage/usb-storage/description @@ -500,6 +508,7 @@ endef $(eval $(call KernelPackage,usb-storage)) + define KernelPackage/usb-storage-extras SUBMENU:=$(USB_MENU) TITLE:=Extra drivers for usb-storage @@ -540,11 +549,12 @@ $(eval $(call KernelPackage,usb-storage-extras)) define KernelPackage/usb-video -$(call AddDepends/usb,@LINUX_2_6) TITLE:=Support for USB video devices + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_VIDEO_USBVIDEO FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,usbvideo) + $(call AddDepends/usb) endef define KernelPackage/usb-video/description @@ -555,11 +565,12 @@ $(eval $(call KernelPackage,usb-video)) define KernelPackage/usb-atm -$(call AddDepends/usb,@LINUX_2_6 +kmod-atm) TITLE:=Support for ATM on USB bus + DEPENDS:=@LINUX_2_6 +kmod-atm KCONFIG:=CONFIG_USB_ATM FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,usbatm) + $(call AddDepends/usb) endef define KernelPackage/usb-atm/description @@ -571,16 +582,17 @@ $(eval $(call KernelPackage,usb-atm)) define AddDepends/usb-atm SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-atm $(1) + DEPENDS+=kmod-usb-atm $(1) endef define KernelPackage/usb-atm-speedtouch -$(call AddDepends/usb-atm,@LINUX_2_6) TITLE:=SpeedTouch USB ADSL modems support + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SPEEDTOUCH FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,speedtch) + $(call AddDepends/usb-atm) endef define KernelPackage/usb-atm-speedtouch/description @@ -591,11 +603,12 @@ $(eval $(call KernelPackage,usb-atm-speedtouch)) define KernelPackage/usb-atm-ueagle -$(call AddDepends/usb-atm,@LINUX_2_6) TITLE:=Eagle 8051 based USB ADSL modems support + DEPENDS:=@LINUX_2_6 FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_UEAGLEATM AUTOLOAD:=$(call AutoLoad,70,ueagle-atm) + $(call AddDepends/usb-atm) endef define KernelPackage/usb-atm-ueagle/description @@ -606,11 +619,12 @@ $(eval $(call KernelPackage,usb-atm-ueagle)) define KernelPackage/usb-atm-cxacru -$(call AddDepends/usb-atm,@LINUX_2_6) TITLE:=cxacru + DEPENDS:=@LINUX_2_6 FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_CXACRU AUTOLOAD:=$(call AutoLoad,70,cxacru) + $(call AddDepends/usb-atm) endef define KernelPackage/usb-atm-cxacru/description @@ -621,10 +635,10 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) define KernelPackage/usb-net -$(call AddDepends/usb,) TITLE:=Kernel modules for USB-to-Ethernet convertors KCONFIG:=CONFIG_USB_USBNET AUTOLOAD:=$(call AutoLoad,60,usbnet) + $(call AddDepends/usb) endef define KernelPackage/usb-net/2.4 @@ -644,16 +658,17 @@ $(eval $(call KernelPackage,usb-net)) define AddDepends/usb-net SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-net $(1) + DEPENDS+=kmod-usb-net $(1) endef define KernelPackage/usb-net-asix -$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Asix convertors + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_AX8817X FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,asix) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-asix/description @@ -664,12 +679,13 @@ $(eval $(call KernelPackage,usb-net-asix)) define KernelPackage/usb-net-hso -$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for Option USB High Speed Mobile Devices + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_HSO FILES:= \ $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,hso) + $(call AddDepends/usb-net) $(call AddDepends/rfkill) endef @@ -681,11 +697,12 @@ $(eval $(call KernelPackage,usb-net-hso)) define KernelPackage/usb-net-kaweth -$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_KAWETH FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,kaweth) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-kaweth/description @@ -696,11 +713,12 @@ $(eval $(call KernelPackage,usb-net-kaweth)) define KernelPackage/usb-net-pegasus -$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_PEGASUS FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,pegasus) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-pegasus/description @@ -711,11 +729,12 @@ $(eval $(call KernelPackage,usb-net-pegasus)) define KernelPackage/usb-net-mcs7830 -$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_MCS7830 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,mcs7830) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-mcs7830/description @@ -726,11 +745,12 @@ $(eval $(call KernelPackage,usb-net-mcs7830)) define KernelPackage/usb-net-dm9601-ether -$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Support for DM9601 ethernet connections + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_DM9601 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,dm9601) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-dm9601-ether/description @@ -740,11 +760,12 @@ endef $(eval $(call KernelPackage,usb-net-dm9601-ether)) define KernelPackage/usb-net-cdc-ether -$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Support for cdc ethernet connections + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_CDCETHER FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,cdc_ether) + $(call AddDepends/usb-net) endef define KernelPackage/usb-net-cdc-ether/description @@ -755,11 +776,12 @@ $(eval $(call KernelPackage,usb-net-cdc-ether)) define KernelPackage/usb-net-rndis -$(call AddDepends/usb-net,@LINUX_2_6 +kmod-usb-net-cdc-ether) TITLE:=Support for RNDIS connections + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_RNDIS_HOST FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,62,rndis_host) + $(call AddDepends/usb-net,+kmod-usb-net-cdc-ether) endef define KernelPackage/usb-net-rndis/description @@ -770,13 +792,14 @@ $(eval $(call KernelPackage,usb-net-rndis)) define KernelPackage/usb-hid -$(call AddDepends/usb,@LINUX_2_6 +kmod-input-evdev) TITLE:=Support for USB Human Input Devices + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko AUTOLOAD:=$(call AutoLoad,70,usbhid) + $(call AddDepends/usb) $(call AddDepends/hid) - $(call AddDepends/input) + $(call AddDepends/input,+kmod-input-evdev) endef @@ -788,12 +811,13 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink -$(call AddDepends/usb,@LINUX_2_6 +kmod-input-evdev) TITLE:=USB Yealink VOIP phone + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko AUTOLOAD:=$(call AutoLoad,70,yealink) - $(call AddDepends/input) + $(call AddDepends/usb) + $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-yealink/description @@ -804,12 +828,13 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 -$(call AddDepends/usb,@LINUX_2_6 +kmod-input-evdev) TITLE:=Support for CM109 device + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko AUTOLOAD:=$(call AutoLoad,70,cm109) - $(call AddDepends/input) + $(call AddDepends/usb) + $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-cm109/description @@ -820,10 +845,11 @@ $(eval $(call KernelPackage,usb-cm109)) define KernelPackage/usb-test -$(call AddDepends/usb,@LINUX_2_6 @DEVEL) TITLE:=USB Testing Driver + DEPENDS:=@LINUX_2_6 @DEVEL KCONFIG:=CONFIG_USB_TEST FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko + $(call AddDepends/usb) endef define KernelPackage/usb-test/description @@ -834,10 +860,11 @@ $(eval $(call KernelPackage,usb-test)) define KernelPackage/usb-phidget -$(call AddDepends/usb,@LINUX_2_6) TITLE:=USB Phidget Driver + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_PHIDGET CONFIG_USB_PHIDGETKIT CONFIG_USB_PHIDGETMOTORCONTROL CONFIG_USB_PHIDGETSERVO FILES:=$(LINUX_DIR)/drivers/usb/misc/phidget*.ko +$(call AddDepends/usb) endef define KernelPackage/usb-phidget/description diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index f194878326..170e3424f1 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -52,11 +52,12 @@ endef define KernelPackage/video-cpia2 -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=CPIA2 video driver + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_VIDEO_CPIA2 FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,cpia2) + $(call AddDepends/video) endef define KernelPackage/video-cpia2/description @@ -67,11 +68,12 @@ $(eval $(call KernelPackage,video-cpia2)) define KernelPackage/video-konica -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=Konica USB webcam support + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_USB_KONICAWC FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/konicawc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,konicawc) + $(call AddDepends/video) endef define KernelPackage/video-konica/description @@ -88,6 +90,7 @@ $(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) KCONFIG:=CONFIG_VIDEO_OV511 FILES:=$(LINUX_DIR)/drivers/media/video/ov511.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,ov511) + $(call AddDepends/video) endef @@ -104,6 +107,7 @@ $(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core) KCONFIG:=CONFIG_VIDEO_OVCAMCHIP FILES:=$(LINUX_DIR)/drivers/media/video/ovcamchip/ovcamchip.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,ovcamchip) + $(call AddDepends/video) endef @@ -121,6 +125,7 @@ $(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) KCONFIG:=CONFIG_USB_SN9C102 FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,gspca_sn9c20x) + $(call AddDepends/video) endef @@ -140,6 +145,7 @@ $(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) CONFIG_USB_PWC_DEBUG=n FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,pwc) + $(call AddDepends/video) endef @@ -155,6 +161,7 @@ $(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,uvcvideo) + $(call AddDepends/video) endef @@ -166,12 +173,13 @@ $(eval $(call KernelPackage,video-uvc)) define KernelPackage/video-gspca-core -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) MENU:=1 TITLE:=GSPCA webcam core support framework + DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_USB_GSPCA FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_main.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,gspca_main) + $(call AddDepends/video) endef define KernelPackage/video-gspca-core/description @@ -189,11 +197,11 @@ endef define KernelPackage/video-gspca-conex -$(call AddDepends/video-gspca,) TITLE:=conex webcam support KCONFIG:=CONFIG_USB_GSPCA_CONEX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_conex.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_conex) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-conex/description @@ -204,11 +212,11 @@ $(eval $(call KernelPackage,video-gspca-conex)) define KernelPackage/video-gspca-etoms -$(call AddDepends/video-gspca,) TITLE:=etoms webcam support KCONFIG:=CONFIG_USB_GSPCA_ETOMS FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_etoms.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_etoms) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-etoms/description @@ -219,11 +227,11 @@ $(eval $(call KernelPackage,video-gspca-etoms)) define KernelPackage/video-gspca-finepix -$(call AddDepends/video-gspca,) TITLE:=finepix webcam support KCONFIG:=CONFIG_USB_GSPCA_FINEPIX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_finepix.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_finepix) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-finepix/description @@ -234,11 +242,11 @@ $(eval $(call KernelPackage,video-gspca-finepix)) define KernelPackage/video-gspca-mars -$(call AddDepends/video-gspca,) TITLE:=mars webcam support KCONFIG:=CONFIG_USB_GSPCA_MARS FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mars.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_mars) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-mars/description @@ -249,11 +257,11 @@ $(eval $(call KernelPackage,video-gspca-mars)) define KernelPackage/video-gspca-mr97310a -$(call AddDepends/video-gspca,) TITLE:=mr97310a webcam support KCONFIG:=CONFIG_USB_GSPCA_MR97310A FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-mr97310a/description @@ -264,11 +272,11 @@ $(eval $(call KernelPackage,video-gspca-mr97310a)) define KernelPackage/video-gspca-ov519 -$(call AddDepends/video-gspca,) TITLE:=ov519 webcam support KCONFIG:=CONFIG_USB_GSPCA_OV519 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov519.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_ov519) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-ov519/description @@ -279,11 +287,11 @@ $(eval $(call KernelPackage,video-gspca-ov519)) define KernelPackage/video-gspca-ov534 -$(call AddDepends/video-gspca,) TITLE:=ov534 webcam support KCONFIG:=CONFIG_USB_GSPCA_OV534 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_ov534) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-ov534/description @@ -294,11 +302,11 @@ $(eval $(call KernelPackage,video-gspca-ov534)) define KernelPackage/video-gspca-pac207 -$(call AddDepends/video-gspca,) TITLE:=pac207 webcam support KCONFIG:=CONFIG_USB_GSPCA_PAC207 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac207.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_pac207) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-pac207/description @@ -309,11 +317,11 @@ $(eval $(call KernelPackage,video-gspca-pac207)) define KernelPackage/video-gspca-pac7311 -$(call AddDepends/video-gspca,) TITLE:=pac7311 webcam support KCONFIG:=CONFIG_USB_GSPCA_PAC7311 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac7311.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_pac7311) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-pac7311/description @@ -324,11 +332,11 @@ $(eval $(call KernelPackage,video-gspca-pac7311)) define KernelPackage/video-gspca-sn9c20x -$(call AddDepends/video-gspca,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=sn9c20x webcam support KCONFIG:=CONFIG_USB_GSPCA_SN9C20X FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sn9c20x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,sn9c20x) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-sn9c20x/description @@ -339,11 +347,11 @@ $(eval $(call KernelPackage,video-gspca-sn9c20x)) define KernelPackage/video-gspca-sonixb -$(call AddDepends/video-gspca,) TITLE:=sonixb webcam support KCONFIG:=CONFIG_USB_GSPCA_SONIXB FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sonixb) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-sonixb/description @@ -354,11 +362,11 @@ $(eval $(call KernelPackage,video-gspca-sonixb)) define KernelPackage/video-gspca-sonixj -$(call AddDepends/video-gspca,) TITLE:=sonixj webcam support KCONFIG:=CONFIG_USB_GSPCA_SONIXJ FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixj.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sonixj) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-sonixj/description @@ -369,11 +377,11 @@ $(eval $(call KernelPackage,video-gspca-sonixj)) define KernelPackage/video-gspca-spca500 -$(call AddDepends/video-gspca,) TITLE:=spca500 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA500 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca500.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca500) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-spca500/description @@ -384,11 +392,11 @@ $(eval $(call KernelPackage,video-gspca-spca500)) define KernelPackage/video-gspca-spca501 -$(call AddDepends/video-gspca,) TITLE:=spca501 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA501 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca501.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca501) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-spca501/description @@ -399,11 +407,11 @@ $(eval $(call KernelPackage,video-gspca-spca501)) define KernelPackage/video-gspca-spca505 -$(call AddDepends/video-gspca,) TITLE:=spca505 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA505 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca505.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca505) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-spca505/description @@ -414,11 +422,11 @@ $(eval $(call KernelPackage,video-gspca-spca505)) define KernelPackage/video-gspca-spca506 -$(call AddDepends/video-gspca,) TITLE:=spca506 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA506 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca506.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca506) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-spca506/description @@ -429,11 +437,11 @@ $(eval $(call KernelPackage,video-gspca-spca506)) define KernelPackage/video-gspca-spca508 -$(call AddDepends/video-gspca,) TITLE:=spca508 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA508 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca508.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca508) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-spca508/description @@ -444,11 +452,11 @@ $(eval $(call KernelPackage,video-gspca-spca508)) define KernelPackage/video-gspca-spca561 -$(call AddDepends/video-gspca,) TITLE:=spca561 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA561 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca561.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca561) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-spca561/description @@ -459,11 +467,11 @@ $(eval $(call KernelPackage,video-gspca-spca561)) define KernelPackage/video-gspca-sq905 -$(call AddDepends/video-gspca,) TITLE:=sq905 webcam support KCONFIG:=CONFIG_USB_GSPCA_SQ905 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-sq905/description @@ -474,11 +482,11 @@ $(eval $(call KernelPackage,video-gspca-sq905)) define KernelPackage/video-gspca-sq905c -$(call AddDepends/video-gspca,) TITLE:=sq905c webcam support KCONFIG:=CONFIG_USB_GSPCA_SQ905C FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-sq905c/description @@ -489,11 +497,11 @@ $(eval $(call KernelPackage,video-gspca-sq905c)) define KernelPackage/video-gspca-stk014 -$(call AddDepends/video-gspca,) TITLE:=stk014 webcam support KCONFIG:=CONFIG_USB_GSPCA_STK014 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_stk014.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_stk014) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-stk014/description @@ -504,11 +512,11 @@ $(eval $(call KernelPackage,video-gspca-stk014)) define KernelPackage/video-gspca-sunplus -$(call AddDepends/video-gspca,) TITLE:=sunplus webcam support KCONFIG:=CONFIG_USB_GSPCA_SUNPLUS FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sunplus.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sunplus) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-sunplus/description @@ -519,11 +527,11 @@ $(eval $(call KernelPackage,video-gspca-sunplus)) define KernelPackage/video-gspca-t613 -$(call AddDepends/video-gspca,) TITLE:=t613 webcam support KCONFIG:=CONFIG_USB_GSPCA_T613 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_t613.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_t613) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-t613/description @@ -534,11 +542,11 @@ $(eval $(call KernelPackage,video-gspca-t613)) define KernelPackage/video-gspca-tv8532 -$(call AddDepends/video-gspca,) TITLE:=tv8532 webcam support KCONFIG:=CONFIG_USB_GSPCA_TV8532 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_tv8532.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_tv8532) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-tv8532/description @@ -549,11 +557,11 @@ $(eval $(call KernelPackage,video-gspca-tv8532)) define KernelPackage/video-gspca-vc032x -$(call AddDepends/video-gspca,) TITLE:=vc032x webcam support KCONFIG:=CONFIG_USB_GSPCA_VC032X FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_vc032x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_vc032x) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-vc032x/description @@ -564,11 +572,11 @@ $(eval $(call KernelPackage,video-gspca-vc032x)) define KernelPackage/video-gspca-zc3xx -$(call AddDepends/video-gspca,) TITLE:=zc3xx webcam support KCONFIG:=CONFIG_USB_GSPCA_ZC3XX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_zc3xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_zc3xx) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-zc3xx/description @@ -579,11 +587,11 @@ $(eval $(call KernelPackage,video-gspca-zc3xx)) define KernelPackage/video-gspca-m5602 -$(call AddDepends/video-gspca,) TITLE:=m5602 webcam support KCONFIG:=CONFIG_USB_M5602 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/m5602/gspca_m5602.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_m5602) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-m5602/description @@ -594,11 +602,11 @@ $(eval $(call KernelPackage,video-gspca-m5602)) define KernelPackage/video-gspca-stv06xx -$(call AddDepends/video-gspca,) TITLE:=stv06xx webcam support KCONFIG:=CONFIG_USB_STV06XX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-stv06xx/description @@ -609,11 +617,12 @@ $(eval $(call KernelPackage,video-gspca-stv06xx)) define KernelPackage/video-gspca-gl860 -$(call AddDepends/video-gspca,@LINUX_2_6_32) TITLE:=gl860 webcam support + DEPENDS:=@LINUX_2_6_32 KCONFIG:=CONFIG_USB_GL860 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gl860/gspca_gl860.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_gl860) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-gl800/description @@ -624,11 +633,12 @@ $(eval $(call KernelPackage,video-gspca-gl860)) define KernelPackage/video-gspca-jeilinj -$(call AddDepends/video-gspca,@LINUX_2_6_32) TITLE:=jeilinj webcam support + DEPENDS:=@LINUX_2_6_32 KCONFIG:=CONFIG_USB_GSPCA_JEILINJ FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_jeilinj.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_jeilinj) + $(call AddDepends/video-gspca) endef define KernelPackage/video-gspca-jeilinj/description diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk index 1c3888e38a..1fa44e6d4e 100644 --- a/package/kernel/modules/w1.mk +++ b/package/kernel/modules/w1.mk @@ -35,11 +35,12 @@ endef # 1-wire masters # define KernelPackage/w1-master-gpio -$(call AddDepends/w1,@GPIO_SUPPORT) TITLE:=GPIO 1-wire bus master driver + DEPENDS:=@GPIO_SUPPORT KCONFIG:=CONFIG_W1_MASTER_GPIO FILES:=$(W1_MASTERS_DIR)/w1-gpio.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,w1-gpio) + $(call AddDepends/w1) endef define KernelPackage/w1-master-gpio/description @@ -53,11 +54,11 @@ $(eval $(call KernelPackage,w1-master-gpio)) # 1-wire slaves # define KernelPackage/w1-slave-therm -$(call AddDepends/w1,) TITLE:=Thermal family implementation KCONFIG:=CONFIG_W1_SLAVE_THERM FILES:=$(W1_SLAVES_DIR)/w1_therm.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,w1_therm) + $(call AddDepends/w1) endef define KernelPackage/w1-slave-therm/description @@ -68,11 +69,11 @@ $(eval $(call KernelPackage,w1-slave-therm)) define KernelPackage/w1-slave-smem -$(call AddDepends/w1,) TITLE:=Simple 64bit memory family implementation KCONFIG:=CONFIG_W1_SLAVE_SMEM FILES:=$(W1_SLAVES_DIR)/w1_smem.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,w1_smem) + $(call AddDepends/w1) endef define KernelPackage/w1-slave-smem/description @@ -81,14 +82,15 @@ endef $(eval $(call KernelPackage,w1-slave-smem)) + define KernelPackage/w1-slave-ds2433 -$(call AddDepends/w1,) TITLE:=Simple 64bit memory family implementation KCONFIG:= \ CONFIG_W1_SLAVE_DS2433 \ CONFIG_W1_SLAVE_DS2433_CRC=n FILES:=$(W1_SLAVES_DIR)/w1_ds2433.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,w1_ds2433) + $(call AddDepends/w1) endef define KernelPackage/w1-slave-ds2433/description @@ -99,13 +101,13 @@ $(eval $(call KernelPackage,w1-slave-ds2433)) define KernelPackage/w1-slave-ds2760 -$(call AddDepends/w1,) TITLE:=Dallas 2760 battery monitor chip (HP iPAQ & others) KCONFIG:= \ CONFIG_W1_SLAVE_DS2760 \ CONFIG_W1_SLAVE_DS2433_CRC=n FILES:=$(W1_SLAVES_DIR)/w1_ds2760.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,w1_ds2760) + $(call AddDepends/w1) endef define KernelPackage/w1-slave-ds2760/description -- cgit v1.2.3