diff options
| -rw-r--r-- | package/kernel/modules/block.mk | 40 | ||||
| -rw-r--r-- | package/kernel/modules/crypto.mk | 38 | ||||
| -rw-r--r-- | package/kernel/modules/fs.mk | 46 | ||||
| -rw-r--r-- | package/kernel/modules/hwmon.mk | 14 | ||||
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 48 | ||||
| -rw-r--r-- | package/kernel/modules/sound.mk | 12 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 104 | ||||
| -rw-r--r-- | package/kernel/modules/video.mk | 82 | ||||
| -rw-r--r-- | package/kernel/modules/w1.mk | 14 |
9 files changed, 199 insertions, 199 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index b3677c5dec..85a440aa5e 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -19,14 +19,14 @@ endef $(eval $(call KernelPackage,ata-core)) -define KernelPackage/ata/Depends +define AddDepends/ata SUBMENU:=$(BLOCK_MENU) - DEPENDS:=!TARGET_x86:kmod-ata-core $(1) + DEPENDS+=!TARGET_x86:kmod-ata-core $(1) endef define KernelPackage/ata-ahci -$(call KernelPackage/ata/Depends,) +$(call AddDepends/ata) TITLE:=AHCI Serial ATA support KCONFIG:=CONFIG_SATA_AHCI FILES:=$(LINUX_DIR)/drivers/ata/ahci.$(LINUX_KMOD_SUFFIX) @@ -40,7 +40,7 @@ endef $(eval $(call KernelPackage,ata-ahci)) define KernelPackage/ata-sil -$(call KernelPackage/ata/Depends,) +$(call AddDepends/ata,) TITLE:=Silicon Image SATA support KCONFIG:=CONFIG_SATA_SIL FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.$(LINUX_KMOD_SUFFIX) @@ -55,7 +55,7 @@ $(eval $(call KernelPackage,ata-sil)) define KernelPackage/ata-sil24 -$(call KernelPackage/ata/Depends,) +$(call AddDepends/ata,) TITLE:=Silicon Image 3124/3132 SATA support KCONFIG:=CONFIG_SATA_SIL24 FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.$(LINUX_KMOD_SUFFIX) @@ -70,7 +70,7 @@ $(eval $(call KernelPackage,ata-sil24)) define KernelPackage/ata-artop -$(call KernelPackage/ata/Depends,) +$(call AddDepends/ata,) TITLE:=ARTOP 6210/6260 PATA support KCONFIG:=CONFIG_PATA_ARTOP FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) @@ -84,7 +84,7 @@ endef $(eval $(call KernelPackage,ata-artop)) define KernelPackage/ata-octeon-cf -$(call KernelPackage/ata/Depends,@TARGET_octeon) +$(call AddDepends/ata,@TARGET_octeon) TITLE:=Octeon Compact Flash support KCONFIG:=CONFIG_PATA_OCTEON_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_octeon_cf.$(LINUX_KMOD_SUFFIX) @@ -99,7 +99,7 @@ $(eval $(call KernelPackage,ata-octeon-cf)) define KernelPackage/ata-ixp4xx-cf -$(call KernelPackage/ata/Depends,@TARGET_ixp4xx) +$(call AddDepends/ata,@TARGET_ixp4xx) TITLE:=IXP4XX Compact Flash support KCONFIG:=CONFIG_PATA_IXP4XX_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.$(LINUX_KMOD_SUFFIX) @@ -113,7 +113,7 @@ endef $(eval $(call KernelPackage,ata-ixp4xx-cf)) define KernelPackage/ata-rb532-cf -$(call KernelPackage/ata/Depends,@TARGET_rb532 @BROKEN) +$(call AddDepends/ata,@TARGET_rb532 @BROKEN) TITLE:=RB532 Compact Flash support KCONFIG:= \ CONFIG_PATA_PLATFORM \ @@ -131,7 +131,7 @@ endef $(eval $(call KernelPackage,ata-rb532-cf)) define KernelPackage/ata-nvidia-sata -$(call KernelPackage/ata/Depends,) +$(call AddDepends/ata,) TITLE:=Nvidia Serial ATA support KCONFIG:=CONFIG_SATA_NV FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX) @@ -142,7 +142,7 @@ $(eval $(call KernelPackage,ata-nvidia-sata)) define KernelPackage/ata-magicbox-cf -$(call KernelPackage/ata/Depends,@TARGET_ppc40x) +$(call AddDepends/ata,@TARGET_ppc40x) TITLE:=Magicbox v2/OpenRB Compact flash support KCONFIG:=CONFIG_PATA_MAGICBOX_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.$(LINUX_KMOD_SUFFIX) @@ -176,7 +176,7 @@ $(eval $(call KernelPackage,ata-pdc202xx-old)) define KernelPackage/ata-piix -$(call KernelPackage/ata/Depends,) +$(call AddDepends/ata,) TITLE:=Intel PIIX PATA/SATA support KCONFIG:=CONFIG_ATA_PIIX FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) @@ -192,7 +192,7 @@ $(eval $(call KernelPackage,ata-piix)) define KernelPackage/ata-via-sata -$(call KernelPackage/ata/Depends,) +$(call AddDepends/ata,) TITLE:=VIA SATA support KCONFIG:=CONFIG_SATA_VIA FILES:=$(LINUX_DIR)/drivers/ata/sata_via.$(LINUX_KMOD_SUFFIX) @@ -252,14 +252,14 @@ endef $(eval $(call KernelPackage,ide-core)) -define KernelPackage/ide/Depends +define AddDepends/ide SUBMENU:=$(BLOCK_MENU) DEPENDS:=kmod-ide-core $(1) endef define KernelPackage/ide-generic -$(call KernelPackage/ide/Depends,@PCI_SUPPORT) +$(call AddDepends/ide,@PCI_SUPPORT) SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for generic PCI IDE chipsets KCONFIG:=CONFIG_BLK_DEV_GENERIC @@ -283,7 +283,7 @@ $(eval $(call KernelPackage,ide-generic)) define KernelPackage/ide-generic-old -$(call KernelPackage/ide/Depends,@LINUX_2_6) +$(call AddDepends/ide,@LINUX_2_6) SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for generic (legacy) IDE chipsets KCONFIG:=CONFIG_IDE_GENERIC @@ -295,7 +295,7 @@ $(eval $(call KernelPackage,ide-generic-old)) define KernelPackage/ide-aec62xx -$(call KernelPackage/ide/Depends,@PCI_SUPPORT) +$(call AddDepends/ide,@PCI_SUPPORT) TITLE:=Acard AEC62xx IDE driver KCONFIG:=CONFIG_BLK_DEV_AEC62XX FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX) @@ -314,7 +314,7 @@ $(eval $(call KernelPackage,ide-aec62xx,1)) define KernelPackage/ide-pdc202xx -$(call KernelPackage/ide/Depends,@PCI_SUPPORT) +$(call AddDepends/ide,@PCI_SUPPORT) TITLE:=Promise PDC202xx IDE driver KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX) @@ -334,7 +334,7 @@ $(eval $(call KernelPackage,ide-pdc202xx)) define KernelPackage/ide-it821x -$(call KernelPackage/ide/Depends,@PCI_SUPPORT) +$(call AddDepends/ide,@PCI_SUPPORT) TITLE:=ITE IT821x IDE driver KCONFIG:=CONFIG_BLK_DEV_IT821X FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX) @@ -440,7 +440,7 @@ $(eval $(call KernelPackage,dm)) define KernelPackage/pata-rb153-cf -$(call KernelPackage/ata/Depends,@TARGET_adm5120_router_le) +$(call AddDepends/ata,@TARGET_adm5120_router_le) TITLE:=RouterBOARD 153 CF Slot support KCONFIG:=CONFIG_PATA_RB153_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_rb153_cf.$(LINUX_KMOD_SUFFIX) diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index d3c24c9c7b..3f9259bf3c 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -56,14 +56,14 @@ endef $(eval $(call KernelPackage,crypto-core)) -define KernelPackage/crypto/Depends +define AddDepends/crypto SUBMENU:=$(CRYPTO_MENU) DEPENDS:=kmod-crypto-core $(1) endef define KernelPackage/crypto-hw-padlock -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=VIA PadLock ACE with AES/SHA hw crypto module KCONFIG:= \ CONFIG_CRYPTO_HW=y \ @@ -80,7 +80,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock)) define KernelPackage/crypto-hw-geode -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=AMD Geode hardware crypto module KCONFIG:= \ CONFIG_CRYPTO_HW=y \ @@ -93,7 +93,7 @@ $(eval $(call KernelPackage,crypto-hw-geode)) define KernelPackage/crypto-hw-hifn-795x -$(call KernelPackage/crypto/Depends,+kmod-crypto-des @!TARGET_ubicom32) +$(call AddDepends/crypto,+kmod-crypto-des @!TARGET_ubicom32) TITLE:=HIFN 795x crypto accelerator KCONFIG:= \ CONFIG_CRYPTO_HW=y \ @@ -108,7 +108,7 @@ $(eval $(call KernelPackage,crypto-hw-hifn-795x)) define KernelPackage/crypto-hw-ixp4xx -$(call KernelPackage/crypto/Depends,@TARGET_ixp4xx +kmod-crypto-des +kmod-crypto-authenc) +$(call AddDepends/crypto,@TARGET_ixp4xx +kmod-crypto-des +kmod-crypto-authenc) TITLE:=Intel IXP4xx hardware crypto module KCONFIG:= \ CONFIG_CRYPTO_HW=y \ @@ -125,7 +125,7 @@ $(eval $(call KernelPackage,crypto-hw-ixp4xx)) define KernelPackage/crypto-hw-ppc4xx -$(call KernelPackage/crypto/Depends,@TARGET_ppc40x||TARGET_ppc44x) +$(call AddDepends/crypto,@TARGET_ppc40x||TARGET_ppc44x) TITLE:=AMCC PPC4xx hardware crypto module KCONFIG:= \ CONFIG_CRYPTO_HW=y \ @@ -142,7 +142,7 @@ $(eval $(call KernelPackage,crypto-hw-ppc4xx)) define KernelPackage/crypto-aes -$(call KernelPackage/crypto/Depends,) +$(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) @@ -158,7 +158,7 @@ $(eval $(call KernelPackage,crypto-aes)) define KernelPackage/crypto-arc4 -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=ARC4 (RC4) cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_ARC4 FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX) @@ -169,7 +169,7 @@ $(eval $(call KernelPackage,crypto-arc4)) define KernelPackage/crypto-authenc -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=Combined mode wrapper for IPsec KCONFIG:=CONFIG_CRYPTO_AUTHENC FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX) @@ -179,7 +179,7 @@ endef $(eval $(call KernelPackage,crypto-authenc)) define KernelPackage/crypto-des -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=DES/3DES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_DES FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX) @@ -190,7 +190,7 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-hmac -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=HMAC digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_HMAC FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX) @@ -201,7 +201,7 @@ $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-md5 -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=MD5 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MD5 FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX) @@ -212,7 +212,7 @@ $(eval $(call KernelPackage,crypto-md5)) define KernelPackage/crypto-michael-mic -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=Michael MIC keyed digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC FILES:=$(LINUX_DIR)/crypto/michael_mic.$(LINUX_KMOD_SUFFIX) @@ -223,7 +223,7 @@ $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=SHA1 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_SHA1 FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX) @@ -234,7 +234,7 @@ $(eval $(call KernelPackage,crypto-sha1)) define KernelPackage/crypto-misc -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=Other CryptoAPI modules KCONFIG:= \ CONFIG_CRYPTO_ANUBIS \ @@ -287,7 +287,7 @@ $(eval $(call KernelPackage,crypto-misc)) define KernelPackage/crypto-ocf -$(call KernelPackage/crypto/Depends,@!TARGET_uml +@OPENSSL_ENGINE) +$(call AddDepends/crypto,@!TARGET_uml +@OPENSSL_ENGINE) TITLE:=OCF modules KCONFIG:= \ CONFIG_OCF_OCF \ @@ -310,7 +310,7 @@ $(eval $(call KernelPackage,crypto-ocf)) define KernelPackage/crypto-null -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=Null CryptoAPI module KCONFIG:=CONFIG_CRYPTO_NULL FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX) @@ -321,7 +321,7 @@ $(eval $(call KernelPackage,crypto-null)) define KernelPackage/crypto-test -$(call KernelPackage/crypto/Depends,) +$(call AddDepends/crypto,) TITLE:=Test CryptoAPI module KCONFIG:=CONFIG_CRYPTO_TEST FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 49193e66ce..de0bd54ce0 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +7,7 @@ FS_MENU:=Filesystems -define KernelPackage/nls/Depends +define AddDepends/nls DEPENDS:= +!LINUX_2_4:kmod-nls-base endef @@ -17,7 +17,7 @@ define KernelPackage/fs-cifs KCONFIG:=CONFIG_CIFS FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,cifs) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -49,7 +49,7 @@ define KernelPackage/fs-ntfs KCONFIG:=CONFIG_NTFS_FS FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,ntfs) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef define KernelPackage/fs-ntfs/description @@ -142,7 +142,7 @@ define KernelPackage/fs-hfs KCONFIG:=CONFIG_HFS_FS FILES:=$(LINUX_DIR)/fs/hfs/hfs.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,hfs) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef define KernelPackage/fs-hfs/description @@ -158,7 +158,7 @@ define KernelPackage/fs-hfsplus KCONFIG:=CONFIG_HFSPLUS_FS FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,hfsplus) -$(call KernelPackage/nls/Depends,utf8) +$(call AddDepends/nls,utf8) endef @@ -175,7 +175,7 @@ define KernelPackage/fs-isofs KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,isofs) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -192,7 +192,7 @@ define KernelPackage/fs-udf KCONFIG:=CONFIG_UDF_FS FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,udf) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -290,7 +290,7 @@ define KernelPackage/fs-msdos KCONFIG:=CONFIG_MSDOS_FS FILES:=$(LINUX_DIR)/fs/fat/msdos.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,msdos) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef define KernelPackage/fs-msdos/2.4 @@ -328,7 +328,7 @@ define KernelPackage/fs-vfat $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/fs/fat/vfat.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,fat vfat) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef define KernelPackage/fs-vfat/2.4 @@ -416,7 +416,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -433,7 +433,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -450,7 +450,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -467,7 +467,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -484,7 +484,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -501,7 +501,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -518,7 +518,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -535,7 +535,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -552,7 +552,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -569,7 +569,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -586,7 +586,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef define KernelPackage/nls-utf8/description @@ -602,7 +602,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef @@ -618,7 +618,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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk index 2219d38fa3..bd008fd094 100644 --- a/package/kernel/modules/hwmon.mk +++ b/package/kernel/modules/hwmon.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006,2007 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -26,14 +26,14 @@ endef $(eval $(call KernelPackage,hwmon-core)) -define KernelPackage/hwmon/Depends +define AddDepends/hwmon SUBMENU:=$(HWMON_MENU) DEPENDS:=kmod-hwmon-core $(1) endef define KernelPackage/hwmon-lm75 -$(call KernelPackage/hwmon/Depends,+kmod-i2c-core) +$(call AddDepends/hwmon,+kmod-i2c-core) TITLE:=LM75 monitoring support KCONFIG:=CONFIG_SENSORS_LM75 FILES:=$(LINUX_DIR)/drivers/hwmon/lm75.$(LINUX_KMOD_SUFFIX) @@ -48,7 +48,7 @@ $(eval $(call KernelPackage,hwmon-lm75)) define KernelPackage/hwmon-lm77 -$(call KernelPackage/hwmon/Depends,+kmod-i2c-core) +$(call AddDepends/hwmon,+kmod-i2c-core) TITLE:=LM77 monitoring support KCONFIG:=CONFIG_SENSORS_LM77 FILES:=$(LINUX_DIR)/drivers/hwmon/lm77.$(LINUX_KMOD_SUFFIX) @@ -62,7 +62,7 @@ endef $(eval $(call KernelPackage,hwmon-lm77)) define KernelPackage/hwmon-lm90 -$(call KernelPackage/hwmon/Depends,+kmod-i2c-core) +$(call AddDepends/hwmon,+kmod-i2c-core) TITLE:=LM90 monitoring support KCONFIG:=CONFIG_SENSORS_LM90 FILES:=$(LINUX_DIR)/drivers/hwmon/lm90.$(LINUX_KMOD_SUFFIX) @@ -76,7 +76,7 @@ endef $(eval $(call KernelPackage,hwmon-lm90)) define KernelPackage/hwmon-pc87360 -$(call KernelPackage/hwmon/Depends,@TARGET_x86) +$(call AddDepends/hwmon,@TARGET_x86) TITLE:=PC87360 monitoring support KCONFIG:= \ CONFIG_SENSORS_PC87360 \ @@ -94,7 +94,7 @@ endef $(eval $(call KernelPackage,hwmon-pc87360)) define KernelPackage/hwmon-w83627hf -$(call KernelPackage/hwmon/Depends,@TARGET_rdc||TARGET_x86) +$(call AddDepends/hwmon,@TARGET_rdc||TARGET_x86) TITLE:=Winbond W83627HF monitoring support KCONFIG:= \ CONFIG_SENSORS_W83627HF \ diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index d19a16da3f..f499445144 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -33,14 +33,14 @@ endef $(eval $(call KernelPackage,ipt-core)) -define KernelPackage/ipt/Depends +define AddDepends/ipt SUBMENU:=$(NF_MENU) DEPENDS:= kmod-ipt-core $(1) endef define KernelPackage/ipt-conntrack -$(call KernelPackage/ipt/Depends,) +$(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)) @@ -61,7 +61,7 @@ $(eval $(call KernelPackage,ipt-conntrack)) define KernelPackage/ipt-conntrack-extra -$(call KernelPackage/ipt/Depends,+kmod-ipt-conntrack) +$(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)) @@ -82,7 +82,7 @@ $(eval $(call KernelPackage,ipt-conntrack-extra)) define KernelPackage/ipt-filter -$(call KernelPackage/ipt/Depends,+LINUX_2_6:kmod-textsearch) +$(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)) @@ -100,7 +100,7 @@ $(eval $(call KernelPackage,ipt-filter)) define KernelPackage/ipt-ipopt -$(call KernelPackage/ipt/Depends,) +$(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)) @@ -128,7 +128,7 @@ $(eval $(call KernelPackage,ipt-ipopt)) define KernelPackage/ipt-ipsec -$(call KernelPackage/ipt/Depends,) +$(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)) @@ -147,7 +147,7 @@ $(eval $(call KernelPackage,ipt-ipsec)) define KernelPackage/ipt-nat -$(call KernelPackage/ipt/Depends,+kmod-ipt-conntrack) +$(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)) @@ -164,7 +164,7 @@ $(eval $(call KernelPackage,ipt-nat)) define KernelPackage/ipt-nat-extra -$(call KernelPackage/ipt/Depends,+kmod-ipt-nat) +$(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)) @@ -183,7 +183,7 @@ $(eval $(call KernelPackage,ipt-nat-extra)) define KernelPackage/ipt-nathelper -$(call KernelPackage/ipt/Depends,+kmod-ipt-nat) +$(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)) @@ -202,7 +202,7 @@ $(eval $(call KernelPackage,ipt-nathelper)) define KernelPackage/ipt-nathelper-extra -$(call KernelPackage/ipt/Depends,+kmod-ipt-nat +LINUX_2_6:kmod-textsearch) +$(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)) @@ -226,7 +226,7 @@ $(eval $(call KernelPackage,ipt-nathelper-extra)) define KernelPackage/ipt-imq -$(call KernelPackage/ipt/Depends,) +$(call AddDepends/ipt,) TITLE:=Intermediate Queueing support KCONFIG:= \ CONFIG_IMQ \ @@ -250,7 +250,7 @@ $(eval $(call KernelPackage,ipt-imq)) define KernelPackage/ipt-queue -$(call KernelPackage/ipt/Depends,) +$(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)) @@ -267,7 +267,7 @@ $(eval $(call KernelPackage,ipt-queue)) define KernelPackage/ipt-ulog -$(call KernelPackage/ipt/Depends,) +$(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)) @@ -284,7 +284,7 @@ $(eval $(call KernelPackage,ipt-ulog)) define KernelPackage/ipt-iprange -$(call KernelPackage/ipt/Depends,) +$(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)) @@ -301,7 +301,7 @@ $(eval $(call KernelPackage,ipt-iprange)) define KernelPackage/ipt-extra -$(call KernelPackage/ipt/Depends,) +$(call AddDepends/ipt,) TITLE:=Extra modules KCONFIG:=$(KCONFIG_IPT_EXTRA) FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) @@ -373,14 +373,14 @@ endef $(eval $(call KernelPackage,ebtables)) -define KernelPackage/ebtables/Depends +define AddDepends/ebtables SUBMENU:=$(NF_MENU) DEPENDS:=kmod-ebtables $(1) endef define KernelPackage/ebtables-ipv4 -$(call KernelPackage/ebtables/Depends,) +$(call AddDepends/ebtables,) TITLE:=ebtables: IPv4 support FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_IP4) @@ -396,7 +396,7 @@ $(eval $(call KernelPackage,ebtables-ipv4)) define KernelPackage/ebtables-ipv6 -$(call KernelPackage/ebtables/Depends,) +$(call AddDepends/ebtables,) TITLE:=ebtables: IPv6 support FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_IP6) @@ -412,7 +412,7 @@ $(eval $(call KernelPackage,ebtables-ipv6)) define KernelPackage/ebtables-watchers -$(call KernelPackage/ebtables/Depends,) +$(call AddDepends/ebtables,) TITLE:=ebtables: watchers support FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS) @@ -443,14 +443,14 @@ endef $(eval $(call KernelPackage,nfnetlink)) -define KernelPackage/nfnetlink/Depends +define AddDepends/nfnetlink SUBMENU:=$(NF_MENU) DEPENDS:=@LINUX_2_6 +kmod-nfnetlink $(1) endef define KernelPackage/nfnetlink-log -$(call KernelPackage/nfnetlink/Depends,) +$(call AddDepends/nfnetlink,) TITLE:=Netfilter LOG over NFNETLINK interface FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NETFILTER_NETLINK_LOG @@ -465,7 +465,7 @@ $(eval $(call KernelPackage,nfnetlink-log)) define KernelPackage/nfnetlink-queue -$(call KernelPackage/nfnetlink/Depends,) +$(call AddDepends/nfnetlink,) TITLE:=Netfilter QUEUE over NFNETLINK interface FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NETFILTER_NETLINK_QUEUE @@ -480,7 +480,7 @@ $(eval $(call KernelPackage,nfnetlink-queue)) define KernelPackage/nf-conntrack-netlink -$(call KernelPackage/nfnetlink/Depends,+kmod-ipt-conntrack) +$(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 diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 5278e201f7..f2900f1319 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -78,14 +78,14 @@ endef $(eval $(call KernelPackage,sound-core)) -define KernelPackage/sound/Depends +define AddDepends/sound SUBMENU:=$(SOUND_MENU) DEPENDS:=kmod-sound-core $(1) endef define KernelPackage/sound-i8x0 -$(call KernelPackage/sound/Depends,@!TARGET_uml) +$(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) @@ -102,7 +102,7 @@ $(eval $(call KernelPackage,sound-i8x0)) define KernelPackage/sound-ps3 -$(call KernelPackage/sound/Depends,@TARGET_ps3||TARGET_ps3chk) +$(call AddDepends/sound,@TARGET_ps3||TARGET_ps3chk) TITLE:=PS3 Audio KCONFIG:=CONFIG_SND_PS3 \ CONFIG_SND_PPC=y \ @@ -119,7 +119,7 @@ $(eval $(call KernelPackage,sound-ps3)) define KernelPackage/sound-cs5535audio -$(call KernelPackage/sound/Depends,@!TARGET_uml) +$(call AddDepends/sound,@!TARGET_uml) TITLE:=CS5535 PCI Controller KCONFIG:=CONFIG_SND_CS5535AUDIO FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.$(LINUX_KMOD_SUFFIX) \ @@ -136,7 +136,7 @@ $(eval $(call KernelPackage,sound-cs5535audio)) define KernelPackage/sound-soc-core -$(call KernelPackage/sound/Depends) +$(call AddDepends/sound) TITLE:=SoC sound support KCONFIG:= \ CONFIG_SND_SOC \ diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 044c16fcfe..c9dc830de4 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -38,14 +38,14 @@ endef $(eval $(call KernelPackage,usb-core)) -define KernelPackage/usb/Depends +define AddDepends/usb SUBMENU:=$(USB_MENU) DEPENDS:=kmod-usb-core $(1) endef define KernelPackage/usb-uhci -$(call KernelPackage/usb/Depends,) +$(call AddDepends/usb,) TITLE:=Support for UHCI controllers KCONFIG:= \ CONFIG_USB_UHCI_ALT \ @@ -72,7 +72,7 @@ $(eval $(call KernelPackage,usb-uhci,1)) define KernelPackage/usb-uhci-iv -$(call KernelPackage/usb/Depends,@LINUX_2_4) +$(call AddDepends/usb,@LINUX_2_4) TITLE:=Support for Intel/VIA UHCI controllers KCONFIG:=CONFIG_USB_UHCI FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX) @@ -87,7 +87,7 @@ $(eval $(call KernelPackage,usb-uhci-iv,1)) define KernelPackage/usb-ohci -$(call KernelPackage/usb/Depends,) +$(call AddDepends/usb,) TITLE:=Support for OHCI controllers KCONFIG:= \ CONFIG_USB_OHCI \ @@ -115,7 +115,7 @@ $(eval $(call KernelPackage,usb-ohci,1)) define KernelPackage/usb-adm5120 -$(call KernelPackage/usb/Depends,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le) +$(call AddDepends/usb,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le) TITLE:=Support for the ADM5120 HCD controller KCONFIG:=CONFIG_USB_ADM5120_HCD FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX) @@ -129,7 +129,7 @@ endef $(eval $(call KernelPackage,usb-adm5120)) define KernelPackage/usb-etrax -$(call KernelPackage/usb/Depends,@TARGET_etrax) +$(call AddDepends/usb,@TARGET_etrax) TITLE:=Support for the ETRAX USB host controller KCONFIG:=CONFIG_ETRAX_USB_HOST \ CONFIG_ETRAX_USB_HOST_PORT1=y CONFIG_ETRAX_USB_HOST_PORT2=y @@ -144,7 +144,7 @@ endef $(eval $(call KernelPackage,usb-etrax)) define KernelPackage/usb-octeon -$(call KernelPackage/usb/Depends,@TARGET_octeon) +$(call AddDepends/usb,@TARGET_octeon) TITLE:=Support for the Octeon USB OTG controller KCONFIG:=CONFIG_USB_DWC_OTG FILES:=$(LINUX_DIR)/drivers/usb/host/dwc_otg/dwc_otg.$(LINUX_KMOD_SUFFIX) @@ -159,7 +159,7 @@ $(eval $(call KernelPackage,usb-octeon)) define KernelPackage/usb-isp116x-hcd -$(call KernelPackage/usb/Depends,@TARGET_ppc40x) +$(call AddDepends/usb,@TARGET_ppc40x) TITLE:=Support for the ISP116x USB Host Controller KCONFIG:= \ CONFIG_USB_ISP116X_HCD \ @@ -177,7 +177,7 @@ $(eval $(call KernelPackage,usb-isp116x-hcd)) define KernelPackage/usb2 -$(call KernelPackage/usb/Depends,) +$(call AddDepends/usb,) TITLE:=Support for USB2 controllers KCONFIG:=CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_AR71XX=y @@ -193,7 +193,7 @@ $(eval $(call KernelPackage,usb2)) define KernelPackage/usb-acm -$(call KernelPackage/usb/Depends,) +$(call AddDepends/usb,) TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM endef @@ -216,7 +216,7 @@ $(eval $(call KernelPackage,usb-acm)) define KernelPackage/usb-audio -$(call KernelPackage/usb/Depends,+kmod-sound-core) +$(call AddDepends/usb,+kmod-sound-core) TITLE:=Support for USB audio devices KCONFIG:= \ CONFIG_USB_AUDIO \ @@ -245,7 +245,7 @@ $(eval $(call KernelPackage,usb-audio)) define KernelPackage/usb-printer -$(call KernelPackage/usb/Depends,) +$(call AddDepends/usb,) TITLE:=Support for printers KCONFIG:=CONFIG_USB_PRINTER endef @@ -268,7 +268,7 @@ $(eval $(call KernelPackage,usb-printer)) define KernelPackage/usb-serial -$(call KernelPackage/usb/Depends,) +$(call AddDepends/usb,) TITLE:=Support for USB-to-Serial converters KCONFIG:=CONFIG_USB_SERIAL FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX) @@ -282,14 +282,14 @@ endef $(eval $(call KernelPackage,usb-serial)) -define KernelPackage/usb-serial/Depends +define AddDepends/usb-serial SUBMENU:=$(USB_MENU) DEPENDS:=kmod-usb-serial $(1) endef define KernelPackage/usb-serial-airprime -$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) +$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for Airprime (EVDO) KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX) @@ -304,7 +304,7 @@ $(eval $(call KernelPackage,usb-serial-airprime)) define KernelPackage/usb-serial-belkin -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -319,7 +319,7 @@ $(eval $(call KernelPackage,usb-serial-belkin)) define KernelPackage/usb-serial-ch341 -$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) +$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for CH341 devices KCONFIG:=CONFIG_USB_SERIAL_CH341 FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX) @@ -334,7 +334,7 @@ $(eval $(call KernelPackage,usb-serial-ch341)) define KernelPackage/usb-serial-ftdi -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -349,7 +349,7 @@ $(eval $(call KernelPackage,usb-serial-ftdi)) define KernelPackage/usb-serial-mct -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -364,7 +364,7 @@ $(eval $(call KernelPackage,usb-serial-mct)) define KernelPackage/usb-serial-pl2303 -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -379,7 +379,7 @@ $(eval $(call KernelPackage,usb-serial-pl2303)) define KernelPackage/usb-serial-cp210x -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -394,7 +394,7 @@ $(eval $(call KernelPackage,usb-serial-cp210x)) define KernelPackage/usb-serial-ark3116 -$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) +$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for ArkMicroChips ARK3116 devices KCONFIG:=CONFIG_USB_SERIAL_ARK3116 FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.$(LINUX_KMOD_SUFFIX) @@ -409,7 +409,7 @@ $(eval $(call KernelPackage,usb-serial-ark3116)) define KernelPackage/usb-serial-oti6858 -$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) +$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for Ours Technology OTI6858 devices KCONFIG:=CONFIG_USB_SERIAL_OTI6858 FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.$(LINUX_KMOD_SUFFIX) @@ -424,7 +424,7 @@ $(eval $(call KernelPackage,usb-serial-oti6858)) define KernelPackage/usb-serial-sierrawireless -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -439,7 +439,7 @@ $(eval $(call KernelPackage,usb-serial-sierrawireless)) define KernelPackage/usb-serial-motorola-phone -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -455,7 +455,7 @@ $(eval $(call KernelPackage,usb-serial-motorola-phone)) define KernelPackage/usb-serial-visor -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -470,7 +470,7 @@ $(eval $(call KernelPackage,usb-serial-visor)) define KernelPackage/usb-serial-cypress-m8 -$(call KernelPackage/usb-serial/Depends,) +$(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) @@ -488,7 +488,7 @@ $(eval $(call KernelPackage,usb-serial-cypress-m8)) define KernelPackage/usb-serial-keyspan -$(call KernelPackage/usb-serial/Depends,) +$(call AddDepends/usb-serial,) TITLE:=Support for Keyspan USB-to-Serial devices KCONFIG:= \ CONFIG_USB_SERIAL_KEYSPAN \ @@ -516,7 +516,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan)) define KernelPackage/usb-serial-option -$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) +$(call AddDepends/usb-serial,@LINUX_2_6) TITLE:=Support for Option HSDPA modems KCONFIG:=CONFIG_USB_SERIAL_OPTION FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX) @@ -531,7 +531,7 @@ $(eval $(call KernelPackage,usb-serial-option)) define KernelPackage/usb-storage -$(call KernelPackage/usb/Depends,+!TARGET_x86:kmod-scsi-core) +$(call AddDepends/usb,+!TARGET_x86:kmod-scsi-core) TITLE:=USB Storage support KCONFIG:=CONFIG_USB_STORAGE FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) @@ -584,7 +584,7 @@ $(eval $(call KernelPackage,usb-storage-extras)) define KernelPackage/usb-video -$(call KernelPackage/usb/Depends,@LINUX_2_6) +$(call AddDepends/usb,@LINUX_2_6) TITLE:=Support for USB video devices KCONFIG:=CONFIG_VIDEO_USBVIDEO FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX) @@ -599,7 +599,7 @@ $(eval $(call KernelPackage,usb-video)) define KernelPackage/usb-atm -$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-atm) +$(call AddDepends/usb,@LINUX_2_6 +kmod-atm) TITLE:=Support for ATM on USB bus KCONFIG:=CONFIG_USB_ATM FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) @@ -613,14 +613,14 @@ endef $(eval $(call KernelPackage,usb-atm)) -define KernelPackage/usb-atm/Depends +define AddDepends/usb-atm SUBMENU:=$(USB_MENU) DEPENDS:=kmod-usb-atm $(1) endef define KernelPackage/usb-atm-speedtouch -$(call KernelPackage/usb-atm/Depends,@LINUX_2_6) +$(call AddDepends/usb-atm,@LINUX_2_6) TITLE:=SpeedTouch USB ADSL modems support KCONFIG:=CONFIG_USB_SPEEDTOUCH FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX) @@ -635,7 +635,7 @@ $(eval $(call KernelPackage,usb-atm-speedtouch)) define KernelPackage/usb-atm-ueagle -$(call KernelPackage/usb-atm/Depends,@LINUX_2_6) +$(call AddDepends/usb-atm,@LINUX_2_6) TITLE:=Eagle 8051 based USB ADSL modems support FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_UEAGLEATM @@ -650,7 +650,7 @@ $(eval $(call KernelPackage,usb-atm-ueagle)) define KernelPackage/usb-atm-cxacru -$(call KernelPackage/usb-atm/Depends,@LINUX_2_6) +$(call AddDepends/usb-atm,@LINUX_2_6) TITLE:=cxacru FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_CXACRU @@ -665,7 +665,7 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) define KernelPackage/usb-net -$(call KernelPackage/usb/Depends,) +$(call AddDepends/usb,) TITLE:=Kernel modules for USB-to-Ethernet convertors KCONFIG:=CONFIG_USB_USBNET AUTOLOAD:=$(call AutoLoad,60,usbnet) @@ -686,14 +686,14 @@ endef $(eval $(call KernelPackage,usb-net)) -define KernelPackage/usb-net/Depends +define AddDepends/usb-net SUBMENU:=$(USB_MENU) DEPENDS:=kmod-usb-net $(1) endef define KernelPackage/usb-net-asix -$(call KernelPackage/usb-net/Depends,@LINUX_2_6) +$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Asix convertors KCONFIG:=CONFIG_USB_NET_AX8817X FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX) @@ -708,7 +708,7 @@ $(eval $(call KernelPackage,usb-net-asix)) define KernelPackage/usb-net-hso -$(call KernelPackage/usb-net/Depends,@LINUX_2_6) +$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO FILES:= \ @@ -725,7 +725,7 @@ $(eval $(call KernelPackage,usb-net-hso)) define KernelPackage/usb-net-kaweth -$(call KernelPackage/usb-net/Depends,@LINUX_2_6) +$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors KCONFIG:=CONFIG_USB_KAWETH FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX) @@ -740,7 +740,7 @@ $(eval $(call KernelPackage,usb-net-kaweth)) define KernelPackage/usb-net-pegasus -$(call KernelPackage/usb-net/Depends,@LINUX_2_6) +$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors KCONFIG:=CONFIG_USB_PEGASUS FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX) @@ -755,7 +755,7 @@ $(eval $(call KernelPackage,usb-net-pegasus)) define KernelPackage/usb-net-mcs7830 -$(call KernelPackage/usb-net/Depends,@LINUX_2_6) +$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors KCONFIG:=CONFIG_USB_NET_MCS7830 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.$(LINUX_KMOD_SUFFIX) @@ -770,7 +770,7 @@ $(eval $(call KernelPackage,usb-net-mcs7830)) define KernelPackage/usb-net-dm9601-ether -$(call KernelPackage/usb-net/Depends,@LINUX_2_6) +$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Support for DM9601 ethernet connections KCONFIG:=CONFIG_USB_NET_DM9601 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.$(LINUX_KMOD_SUFFIX) @@ -784,7 +784,7 @@ endef $(eval $(call KernelPackage,usb-net-dm9601-ether)) define KernelPackage/usb-net-cdc-ether -$(call KernelPackage/usb-net/Depends,@LINUX_2_6) +$(call AddDepends/usb-net,@LINUX_2_6) TITLE:=Support for cdc ethernet connections KCONFIG:=CONFIG_USB_NET_CDCETHER FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX) @@ -799,7 +799,7 @@ $(eval $(call KernelPackage,usb-net-cdc-ether)) define KernelPackage/usb-net-rndis -$(call KernelPackage/usb-net/Depends,@LINUX_2_6 +kmod-usb-net-cdc-ether) +$(call AddDepends/usb-net,@LINUX_2_6 +kmod-usb-net-cdc-ether) TITLE:=Support for RNDIS connections KCONFIG:=CONFIG_USB_NET_RNDIS_HOST FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX) @@ -814,7 +814,7 @@ $(eval $(call KernelPackage,usb-net-rndis)) define KernelPackage/usb-hid -$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-evdev) +$(call AddDepends/usb,@LINUX_2_6 +kmod-input-evdev) TITLE:=Support for USB Human Input Devices KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko @@ -832,7 +832,7 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink -$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-evdev) +$(call AddDepends/usb,@LINUX_2_6 +kmod-input-evdev) TITLE:=USB Yealink VOIP phone KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko @@ -848,7 +848,7 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 -$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-evdev) +$(call AddDepends/usb,@LINUX_2_6 +kmod-input-evdev) TITLE:=Support for CM109 device KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko @@ -864,7 +864,7 @@ $(eval $(call KernelPackage,usb-cm109)) define KernelPackage/usb-test -$(call KernelPackage/usb/Depends,@LINUX_2_6 @DEVEL) +$(call AddDepends/usb,@LINUX_2_6 @DEVEL) TITLE:=USB Testing Driver KCONFIG:=CONFIG_USB_TEST FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko @@ -878,7 +878,7 @@ $(eval $(call KernelPackage,usb-test)) define KernelPackage/usb-phidget -$(call KernelPackage/usb/Depends,@LINUX_2_6) +$(call AddDepends/usb,@LINUX_2_6) TITLE:=USB Phidget Driver KCONFIG:=CONFIG_USB_PHIDGET CONFIG_USB_PHIDGETKIT CONFIG_USB_PHIDGETMOTORCONTROL CONFIG_USB_PHIDGETSERVO FILES:=$(LINUX_DIR)/drivers/usb/misc/phidget*.ko diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 6bc19fd4f9..f194878326 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -1,6 +1,6 @@ # # Copyright (C) 2009 David Cooper <dave@kupesoft.com> -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -45,14 +45,14 @@ endef $(eval $(call KernelPackage,video-core)) -define KernelPackage/video/Depends +define AddDepends/video SUBMENU:=$(VIDEO_MENU) DEPENDS+=kmod-video-core $(1) endef define KernelPackage/video-cpia2 -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=CPIA2 video driver KCONFIG:=CONFIG_VIDEO_CPIA2 FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX) @@ -67,7 +67,7 @@ $(eval $(call KernelPackage,video-cpia2)) define KernelPackage/video-konica -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=Konica USB webcam support KCONFIG:=CONFIG_USB_KONICAWC FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/konicawc.$(LINUX_KMOD_SUFFIX) @@ -83,7 +83,7 @@ $(eval $(call KernelPackage,video-konica)) define KernelPackage/video-ov511 -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=OV511 USB webcam support KCONFIG:=CONFIG_VIDEO_OV511 FILES:=$(LINUX_DIR)/drivers/media/video/ov511.$(LINUX_KMOD_SUFFIX) @@ -99,7 +99,7 @@ $(eval $(call KernelPackage,video-ov511)) define KernelPackage/video-ovcamchip -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core) TITLE:=OV6xxx/OV7xxx Camera Chip support KCONFIG:=CONFIG_VIDEO_OVCAMCHIP FILES:=$(LINUX_DIR)/drivers/media/video/ovcamchip/ovcamchip.$(LINUX_KMOD_SUFFIX) @@ -116,7 +116,7 @@ $(eval $(call KernelPackage,video-ovcamchip)) define KernelPackage/video-sn9c102 -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=SN9C102 Camera Chip support KCONFIG:=CONFIG_USB_SN9C102 FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.$(LINUX_KMOD_SUFFIX) @@ -133,7 +133,7 @@ $(eval $(call KernelPackage,video-sn9c102)) define KernelPackage/video-pwc -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=Philips USB webcam support KCONFIG:= \ CONFIG_USB_PWC \ @@ -150,7 +150,7 @@ endef $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=USB Video Class (UVC) support KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) @@ -166,7 +166,7 @@ $(eval $(call KernelPackage,video-uvc)) define KernelPackage/video-gspca-core -$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) MENU:=1 TITLE:=GSPCA webcam core support framework KCONFIG:=CONFIG_USB_GSPCA @@ -182,14 +182,14 @@ endef $(eval $(call KernelPackage,video-gspca-core)) -define KernelPackage/video-gspca/Depends +define AddDepends/video-gspca SUBMENU:=$(VIDEO_MENU) DEPENDS+=kmod-video-gspca-core $(1) endef define KernelPackage/video-gspca-conex -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -204,7 +204,7 @@ $(eval $(call KernelPackage,video-gspca-conex)) define KernelPackage/video-gspca-etoms -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -219,7 +219,7 @@ $(eval $(call KernelPackage,video-gspca-etoms)) define KernelPackage/video-gspca-finepix -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -234,7 +234,7 @@ $(eval $(call KernelPackage,video-gspca-finepix)) define KernelPackage/video-gspca-mars -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -249,7 +249,7 @@ $(eval $(call KernelPackage,video-gspca-mars)) define KernelPackage/video-gspca-mr97310a -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -264,7 +264,7 @@ $(eval $(call KernelPackage,video-gspca-mr97310a)) define KernelPackage/video-gspca-ov519 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -279,7 +279,7 @@ $(eval $(call KernelPackage,video-gspca-ov519)) define KernelPackage/video-gspca-ov534 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -294,7 +294,7 @@ $(eval $(call KernelPackage,video-gspca-ov534)) define KernelPackage/video-gspca-pac207 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -309,7 +309,7 @@ $(eval $(call KernelPackage,video-gspca-pac207)) define KernelPackage/video-gspca-pac7311 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -324,7 +324,7 @@ $(eval $(call KernelPackage,video-gspca-pac7311)) define KernelPackage/video-gspca-sn9c20x -$(call KernelPackage/video-gspca/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(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) @@ -339,7 +339,7 @@ $(eval $(call KernelPackage,video-gspca-sn9c20x)) define KernelPackage/video-gspca-sonixb -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -354,7 +354,7 @@ $(eval $(call KernelPackage,video-gspca-sonixb)) define KernelPackage/video-gspca-sonixj -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -369,7 +369,7 @@ $(eval $(call KernelPackage,video-gspca-sonixj)) define KernelPackage/video-gspca-spca500 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -384,7 +384,7 @@ $(eval $(call KernelPackage,video-gspca-spca500)) define KernelPackage/video-gspca-spca501 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -399,7 +399,7 @@ $(eval $(call KernelPackage,video-gspca-spca501)) define KernelPackage/video-gspca-spca505 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -414,7 +414,7 @@ $(eval $(call KernelPackage,video-gspca-spca505)) define KernelPackage/video-gspca-spca506 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -429,7 +429,7 @@ $(eval $(call KernelPackage,video-gspca-spca506)) define KernelPackage/video-gspca-spca508 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -444,7 +444,7 @@ $(eval $(call KernelPackage,video-gspca-spca508)) define KernelPackage/video-gspca-spca561 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -459,7 +459,7 @@ $(eval $(call KernelPackage,video-gspca-spca561)) define KernelPackage/video-gspca-sq905 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -474,7 +474,7 @@ $(eval $(call KernelPackage,video-gspca-sq905)) define KernelPackage/video-gspca-sq905c -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -489,7 +489,7 @@ $(eval $(call KernelPackage,video-gspca-sq905c)) define KernelPackage/video-gspca-stk014 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -504,7 +504,7 @@ $(eval $(call KernelPackage,video-gspca-stk014)) define KernelPackage/video-gspca-sunplus -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -519,7 +519,7 @@ $(eval $(call KernelPackage,video-gspca-sunplus)) define KernelPackage/video-gspca-t613 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -534,7 +534,7 @@ $(eval $(call KernelPackage,video-gspca-t613)) define KernelPackage/video-gspca-tv8532 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -549,7 +549,7 @@ $(eval $(call KernelPackage,video-gspca-tv8532)) define KernelPackage/video-gspca-vc032x -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -564,7 +564,7 @@ $(eval $(call KernelPackage,video-gspca-vc032x)) define KernelPackage/video-gspca-zc3xx -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -579,7 +579,7 @@ $(eval $(call KernelPackage,video-gspca-zc3xx)) define KernelPackage/video-gspca-m5602 -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -594,7 +594,7 @@ $(eval $(call KernelPackage,video-gspca-m5602)) define KernelPackage/video-gspca-stv06xx -$(call KernelPackage/video-gspca/Depends,) +$(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) @@ -609,7 +609,7 @@ $(eval $(call KernelPackage,video-gspca-stv06xx)) define KernelPackage/video-gspca-gl860 -$(call KernelPackage/video-gspca/Depends,@LINUX_2_6_32) +$(call AddDepends/video-gspca,@LINUX_2_6_32) TITLE:=gl860 webcam support KCONFIG:=CONFIG_USB_GL860 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gl860/gspca_gl860.$(LINUX_KMOD_SUFFIX) @@ -624,7 +624,7 @@ $(eval $(call KernelPackage,video-gspca-gl860)) define KernelPackage/video-gspca-jeilinj -$(call KernelPackage/video-gspca/Depends,@LINUX_2_6_32) +$(call AddDepends/video-gspca,@LINUX_2_6_32) TITLE:=jeilinj webcam support KCONFIG:=CONFIG_USB_GSPCA_JEILINJ FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_jeilinj.$(LINUX_KMOD_SUFFIX) diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk index 68d502799a..1c3888e38a 100644 --- a/package/kernel/modules/w1.mk +++ b/package/kernel/modules/w1.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -25,7 +25,7 @@ endef $(eval $(call KernelPackage,w1)) -define KernelPackage/w1/Depends +define AddDepends/w1 SUBMENU:=$(W1_MENU) DEPENDS+=kmod-w1 $(1) endef @@ -35,7 +35,7 @@ endef # 1-wire masters # define KernelPackage/w1-master-gpio -$(call KernelPackage/w1/Depends,@GPIO_SUPPORT) +$(call AddDepends/w1,@GPIO_SUPPORT) TITLE:=GPIO 1-wire bus master driver KCONFIG:=CONFIG_W1_MASTER_GPIO FILES:=$(W1_MASTERS_DIR)/w1-gpio.$(LINUX_KMOD_SUFFIX) @@ -53,7 +53,7 @@ $(eval $(call KernelPackage,w1-master-gpio)) # 1-wire slaves # define KernelPackage/w1-slave-therm -$(call KernelPackage/w1/Depends,) +$(call AddDepends/w1,) TITLE:=Thermal family implementation KCONFIG:=CONFIG_W1_SLAVE_THERM FILES:=$(W1_SLAVES_DIR)/w1_therm.$(LINUX_KMOD_SUFFIX) @@ -68,7 +68,7 @@ $(eval $(call KernelPackage,w1-slave-therm)) define KernelPackage/w1-slave-smem -$(call KernelPackage/w1/Depends,) +$(call AddDepends/w1,) TITLE:=Simple 64bit memory family implementation KCONFIG:=CONFIG_W1_SLAVE_SMEM FILES:=$(W1_SLAVES_DIR)/w1_smem.$(LINUX_KMOD_SUFFIX) @@ -82,7 +82,7 @@ endef $(eval $(call KernelPackage,w1-slave-smem)) define KernelPackage/w1-slave-ds2433 -$(call KernelPackage/w1/Depends,) +$(call AddDepends/w1,) TITLE:=Simple 64bit memory family implementation KCONFIG:= \ CONFIG_W1_SLAVE_DS2433 \ @@ -99,7 +99,7 @@ $(eval $(call KernelPackage,w1-slave-ds2433)) define KernelPackage/w1-slave-ds2760 -$(call KernelPackage/w1/Depends,) +$(call AddDepends/w1,) TITLE:=Dallas 2760 battery monitor chip (HP iPAQ & others) KCONFIG:= \ CONFIG_W1_SLAVE_DS2760 \ |