aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/kernel.mk3
-rw-r--r--include/netfilter.mk13
-rw-r--r--package/kernel/modules/block.mk37
-rw-r--r--package/kernel/modules/fs.mk102
-rw-r--r--package/kernel/modules/i2c.mk26
-rw-r--r--package/kernel/modules/network.mk87
-rw-r--r--package/kernel/modules/other.mk135
-rw-r--r--package/kernel/modules/usb.mk35
-rw-r--r--package/kernel/modules/wireless.mk15
9 files changed, 279 insertions, 174 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index 519ea42d23..a0f256b998 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -104,7 +104,8 @@ $(call KernelPackage/$(1)/description)
endef
endif
- ifneq ($(if $(KCONFIG),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
+ # check that all CONFIG_* symbols in $(KCONFIG) are set to 'm'
+ ifeq ($(filter-out m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$(if $($(c)),$($(c)),n))),)
ifneq ($(strip $(FILES)),)
define Package/kmod-$(1)/install
mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
diff --git a/include/netfilter.mk b/include/netfilter.mk
index 49ffefbad6..f11deacbd1 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -12,17 +12,20 @@ P_XT:=netfilter/
endif
define nf_add
-$(1)-$$($(2)) += $(3)
-KCONFIG_$(1) += $(2)
+ $(1)-$$($(2)) += $(3)
+ ifeq ($$($(2)),m)
+ KCONFIG_$(1) += $(2)
+ endif
endef
+
IPT_CONNTRACK-m :=
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_CONNMARK, $(P_V4)ipt_connmark))
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_TARGET_CONNMARK, $(P_V4)ipt_CONNMARK))
-$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_CONNTRACK, $(P_V4)ipt_conntrack))
$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_HELPER, $(P_V4)ipt_helper))
$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_STATE, $(P_V4)ipt_state))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_CONNMARK, $(P_V4)ipt_connmark))
$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNMARK, $(P_XT)xt_connmark))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_TARGET_CONNMARK, $(P_V4)ipt_CONNMARK))
$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_TARGET_CONNMARK, $(P_XT)xt_CONNMARK))
+$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_IP_NF_MATCH_CONNTRACK, $(P_V4)ipt_conntrack))
$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_CONNTRACK, $(P_XT)xt_conntrack))
$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_HELPER, $(P_XT)xt_helper))
$(eval $(call nf_add,IPT_CONNTRACK,CONFIG_NETFILTER_XT_MATCH_STATE, $(P_XT)xt_state))
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index c8a8f9040f..5ab3688b07 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -10,23 +10,25 @@ define KernelPackage/ide-core
- ide-core \\\
- ide-detect \\\
- ide-disk
- KCONFIG:=CONFIG_IDE CONFIG_BLK_DEV_IDE CONFIG_IDE_GENERIC CONFIG_BLK_DEV_IDEDISK
-endef
-
-define KernelPackage/ide-core/2.4
+ KCONFIG:= \
+ CONFIG_IDE \
+ CONFIG_BLK_DEV_IDE \
+ CONFIG_BLK_DEV_IDEDISK
FILES:= \
$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
+ AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-disk)
+endef
+
+define KernelPackage/ide-core/2.4
+ FILES+=$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD+=$(call AutoLoad,30,ide-detect)
endef
define KernelPackage/ide-core/2.6
- FILES:= \
- $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-disk)
+ KCONFIG+=CONFIG_IDE_GENERIC
+ FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD+=$(call AutoLoad,30,ide-generic)
endef
$(eval $(call KernelPackage,ide-core))
@@ -58,10 +60,13 @@ $(eval $(call KernelPackage,ide-aec62xx))
define KernelPackage/scsi-core
SUBMENU:=$(BLMENU)
TITLE:=Kernel support for SCSI
- KCONFIG:=CONFIG_SCSI CONFIG_BLK_DEV_SD
+ KCONFIG:= \
+ CONFIG_SCSI \
+ CONFIG_BLK_DEV_SD
FILES:= \
$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,20,scsi_mod) $(call AutoLoad,40,sd_mod)
endef
$(eval $(call KernelPackage,scsi-core))
@@ -70,10 +75,10 @@ $(eval $(call KernelPackage,scsi-core))
define KernelPackage/libata
SUBMENU:=$(BLMENU)
TITLE:=libata
- DESCRIPTION:=libata
DEPENDS:=@PCI_SUPPORT @LINUX_2_6
KCONFIG:=CONFIG_ATA
FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,21,libata)
endef
$(eval $(call KernelPackage,libata))
@@ -86,7 +91,7 @@ define KernelPackage/ata-piix
DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
KCONFIG:=CONFIG_ATA_PIIX
FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
+ AUTOLOAD:=$(call AutoLoad,41,ata_piix)
endef
$(eval $(call KernelPackage,ata-piix))
@@ -96,10 +101,10 @@ define KernelPackage/pata-artop
SUBMENU:=$(BLMENU)
TITLE:=pata-artop
DESCRIPTION:=Kernel module for ARTOP PATA controller
- DEPENDS:=kmod-libata +kmod-scsi-core
+ DEPENDS:=+kmod-libata +kmod-scsi-core
KCONFIG:=CONFIG_PATA_ARTOP
FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
+ AUTOLOAD:=$(call AutoLoad,41,pata_artop)
endef
$(eval $(call KernelPackage,pata-artop))
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 017e64ebe7..f5c837825e 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,5 +1,11 @@
FSMENU:=Filesystems
+define KernelPackage/nls/Depends
+ ifneq ($(KERNEL),2.4)
+ DEPENDS+= +kmod-nls-base $(foreach m,$(1),+kmod-nls-$(m))
+ endif
+endef
+
define KernelPackage/fs-cifs
SUBMENU:=$(FSMENU)
TITLE:=CIFS support
@@ -8,11 +14,9 @@ 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)
endef
-define KernelPackage/fs-cifs/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,fs-cifs))
@@ -57,10 +61,12 @@ define KernelPackage/fs-ext3
SUBMENU:=$(FSMENU)
TITLE:=EXT3 filesystem support
DESCRIPTION:=Kernel module for EXT3 filesystem support
- KCONFIG:=CONFIG_EXT3_FS
+ KCONFIG:= \
+ CONFIG_EXT3_FS \
+ CONFIG_JBD
FILES:= \
- $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
endef
@@ -75,10 +81,7 @@ define KernelPackage/fs-hfs
KCONFIG:=CONFIG_HFS_FS
FILES:=$(LINUX_DIR)/fs/hfs/hfs.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,hfs)
-endef
-
-define KernelPackage/fs-hfs/2.4
- DEPENDS:=
+$(call KernelPackage/nls/Depends)
endef
$(eval $(call KernelPackage,fs-hfs))
@@ -92,11 +95,9 @@ 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)
endef
-define KernelPackage/fs-hfsplus/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,fs-hfsplus))
@@ -105,15 +106,12 @@ define KernelPackage/fs-isofs
SUBMENU:=$(FSMENU)
TITLE:=ISO9660 filesystem support
DESCRIPTION:=Kernel module for ISO9660 filesystem support
- DEPENDS:=+kmod-nls-base
- KCONFIG:=CONFIG_ISO9660_FS
+ 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)
endef
-define Kernel/Package/fs-isofs/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,fs-isofs))
@@ -126,11 +124,9 @@ 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)
endef
-define KernelPackage/fs-udf/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,fs-udf))
@@ -139,11 +135,14 @@ define KernelPackage/fs-nfs
SUBMENU:=$(FSMENU)
TITLE:=NFS filesystem support
DESCRIPTION:=Kernel module for NFS support
- KCONFIG:=CONFIG_NFS_FS
+ KCONFIG:= \
+ CONFIG_NFS_FS \
+ CONFIG_LOCKD \
+ CONFIG_SUNRPC
FILES:= \
- $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
endef
@@ -156,15 +155,13 @@ define KernelPackage/fs-nfsd
DESCRIPTION:=Kernel module for NFS kernel server support
KCONFIG:=CONFIG_NFSD
FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/fs-nfsd/2.4
- AUTOLOAD:=$(call AutoLoad,30,nfsd)
+ AUTOLOAD:=$(call AutoLoad,40,nfsd)
endef
define KernelPackage/fs-nfsd/2.6
+ KCONFIG+=CONFIG_EXPORTFS
FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,exportfs nfsd)
+ AUTOLOAD+=$(call AutoLoad,30,exportfs)
endef
$(eval $(call KernelPackage,fs-nfsd))
@@ -178,11 +175,9 @@ define KernelPackage/fs-msdos
KCONFIG:=CONFIG_MSDOS_FS
FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,40,msdos)
+$(call KernelPackage/nls/Depends)
endef
-define KernelPackage/fs-msdos/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,fs-msdos))
@@ -191,17 +186,16 @@ define KernelPackage/fs-vfat
SUBMENU:=$(FSMENU)
TITLE:=VFAT filesystem support
DESCRIPTION:=Kernel module for VFAT filesystem support
- DEPENDS:=+kmod-nls-base
- KCONFIG:=CONFIG_VFAT_FS
+ KCONFIG:= \
+ CONFIG_FAT_FS \
+ CONFIG_VFAT_FS
FILES:= \
$(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,fat vfat)
+$(call KernelPackage/nls/Depends)
endef
-define KernelPackage/fs-vfat/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,fs-vfat))
@@ -212,7 +206,7 @@ define KernelPackage/fs-xfs
DESCRIPTION:=Kernel module for XFS support
KCONFIG:=CONFIG_XFS_FS
FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs)
+ AUTOLOAD:=$(call AutoLoad,30,xfs)
endef
$(eval $(call KernelPackage,fs-xfs))
@@ -238,11 +232,9 @@ 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)
endef
-define KernelPackage/nfs-c437/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-cp437))
@@ -255,11 +247,9 @@ 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)
endef
-define KernelPackage/nls-cp850/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-cp850))
@@ -272,11 +262,9 @@ 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)
endef
-define KernelPackage/nls-cp1250/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-cp1250))
@@ -289,11 +277,9 @@ 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)
endef
-define KernelPackage/nls-iso8859-1/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-iso8859-1))
@@ -306,11 +292,9 @@ 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)
endef
-define KernelPackage/nls-iso8859-2/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-iso8859-2))
@@ -323,11 +307,9 @@ 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)
endef
-define KernelPackage/nls-iso8859-15/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-iso8859-15))
@@ -340,11 +322,9 @@ 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)
endef
-define KernelPackage/nls-koi8r/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-koi8r))
@@ -357,10 +337,8 @@ 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)
endef
-define KernelPackage/nls-utf8/2.4
- DEPENDS:=
-endef
$(eval $(call KernelPackage,nls-utf8))
diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index 00bd60e302..f8d8d86789 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -13,8 +13,12 @@ define KernelPackage/i2c-core
TITLE:=I2C support
DESCRIPTION:=Kernel modules for i2c support
DEPENDS:=@LINUX_2_6
- KCONFIG:=CONFIG_I2C
- FILES:=$(LINUX_DIR)/drivers/i2c/*.$(LINUX_KMOD_SUFFIX)
+ KCONFIG:= \
+ CONFIG_I2C \
+ CONFIG_I2C_CHARDEV
+ FILES:= \
+ $(LINUX_DIR)/drivers/i2c/i2c-core.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/i2c/i2c-dev.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,i2c-core i2c-dev)
endef
@@ -26,8 +30,14 @@ define KernelPackage/i2c-algos
TITLE:=I2C algorithms support
DESCRIPTION:=Kernel modules for various i2c algorithms
DEPENDS:=kmod-i2c-core
- KCONFIG:=CONFIG_I2C_ALGOBIT
- FILES:=$(LINUX_DIR)/drivers/i2c/algos/*.$(LINUX_KMOD_SUFFIX)
+ KCONFIG:= \
+ CONFIG_I2C_ALGOBIT \
+ CONFIG_I2C_ALGOPCF \
+ CONFIG_I2C_ALGOPCA
+ FILES:= \
+ $(LINUX_DIR)/drivers/i2c/algos/i2c-algo-bit.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/i2c/algos/i2c-algo-pcf.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/i2c/algos/i2c-algo-pca.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,i2c-algo-bit i2c-algo-pcf i2c-algo-pca)
endef
@@ -40,10 +50,12 @@ define KernelPackage/i2c-scx200
DESCRIPTION:=Kernel module for SCX200 i2c bus
DEFAULT:=y if LINUX_2_6_X86_Soekris
DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_X86_Soekris
- KCONFIG:=CONFIG_SCx200_I2C
+ KCONFIG:= \
+ CONFIG_I2C_ISA \
+ CONFIG_SCx200_I2C
FILES:= \
- $(LINUX_DIR)/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/i2c/busses/i2c-isa.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/drivers/i2c/busses/i2c-isa.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,70,i2c-isa scx200_i2c)
endef
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index a7e8fed5d2..f1d37329eb 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -14,10 +14,12 @@ define KernelPackage/atm
DESCRIPTION:= \
Kernel modules for ATM support
DEPENDS:=@LINUX_2_6
- KCONFIG:=CONFIG_ATM
+ KCONFIG:= \
+ CONFIG_ATM \
+ CONFIG_ATM_BR2684
FILES:= \
- $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,atm br2684)
endef
@@ -55,18 +57,14 @@ define KernelPackage/ipip
DESCRIPTION:=\
Kernel modules for IP in IP encapsulation
KCONFIG:=CONFIG_NET_IPIP
-endef
-
-define KernelPackage/ipip/2.4
FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,ipip)
endef
define KernelPackage/ipip/2.6
- FILES:= \
- $(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
+ KCONFIG+=CONFIG_INET_TUNNEL
+ FILES+=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD+=$(call AutoLoad,31,tunnel4)
endef
$(eval $(call KernelPackage,ipip))
@@ -81,7 +79,9 @@ define KernelPackage/ipsec
- af_key\\\
- xfrm_user
DEPENDS:=@LINUX_2_6
- KCONFIG:=CONFIG_NET_KEY
+ KCONFIG:= \
+ CONFIG_NET_KEY \
+ CONFIG_XFRM_USER
FILES:= \
$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
@@ -101,7 +101,11 @@ define KernelPackage/ipsec4
- ipcomp\\\
- xfrm4_tunnel
DEPENDS:=kmod-ipsec
- KCONFIG:=CONFIG_INET_AH
+ KCONFIG:= \
+ CONFIG_INET_AH \
+ CONFIG_INET_ESP \
+ CONFIG_INET_IPCOMP \
+ CONFIG_INET_XFRM_TUNNEL
FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \
$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
)
@@ -122,7 +126,12 @@ define KernelPackage/ipsec6
- xfrm6_tunnel\\\
- tunnel6
DEPENDS:=kmod-ipsec
- KCONFIG:=CONFIG_INET6_AH
+ KCONFIG:= \
+ CONFIG_INET6_AH \
+ CONFIG_INET6_ESP \
+ CONFIG_INET6_IPCOMP \
+ CONFIG_INET6_XFRM_TUNNEL \
+ CONFIG_INET6_TUNNEL
FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel tunnel6, \
$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
)
@@ -137,17 +146,14 @@ define KernelPackage/ipv6
DESCRIPTION:=\
Kernel modules for IPv6 support
KCONFIG:=CONFIG_IPV6
- AUTOLOAD:=$(call AutoLoad,20,ipv6)
-endef
-
-define KernelPackage/ipv6/2.4
FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,20,ipv6)
endef
define KernelPackage/ipv6/2.6
- FILES:= \
- $(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
+ KCONFIG+=CONFIG_IPV6_SIT
+ FILES+=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD+=$(call AutoLoad,21,sit)
endef
$(eval $(call KernelPackage,ipv6))
@@ -183,23 +189,25 @@ define KernelPackage/ppp
TITLE:=PPP modules
DESCRIPTION:=\
Kernel modules for PPP support
- KCONFIG:=CONFIG_PPP
+ KCONFIG:= \
+ CONFIG_PPP \
+ CONFIG_PPP_ASYNC
+ FILES:= \
+ $(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/net/ppp_generic.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/net/slhc.$(LINUX_KMOD_SUFFIX)
endef
define KernelPackage/ppp/2.4
- FILES:= \
- $(LINUX_DIR)/drivers/net/ppp_async.o \
- $(LINUX_DIR)/drivers/net/ppp_generic.o \
- $(LINUX_DIR)/drivers/net/slhc.o
AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
endef
define KernelPackage/ppp/2.6
+ KCONFIG+= \
+ CONFIG_SLHC \
+ CONFIG_CRC_CCITT
FILES:= \
- $(LINUX_DIR)/drivers/net/ppp_async.ko \
- $(LINUX_DIR)/drivers/net/ppp_generic.ko \
- $(LINUX_DIR)/drivers/net/slhc.ko \
- $(LINUX_DIR)/lib/crc-ccitt.ko
+ $(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async)
endef
@@ -254,15 +262,16 @@ define KernelPackage/mppe
TITLE:=Microsoft PPP compression/encryption
DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
DEPENDS:=kmod-ppp
- KCONFIG:=CONFIG_PPP_MPPE_MPPC CONFIG_PPP_MPPE
endef
define KernelPackage/mppe/2.4
+ KCONFIG:=CONFIG_PPP_MPPE_MPPC
FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc)
endef
define KernelPackage/mppe/2.6
+ KCONFIG:=CONFIG_PPP_MPPE
FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
endef
@@ -275,18 +284,20 @@ define KernelPackage/sched
TITLE:=Traffic schedulers
DESCRIPTION:=\
Kernel schedulers for IP traffic
+ KCONFIG:=CONFIG_NET_SCHED
FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,sched))
-
define KernelPackage/ax25
SUBMENU:=$(NSMENU)
TITLE:=AX25 support
DESCRIPTION:=Kernel modules for AX25 support
- KCONFIG:=CONFIG_AX25 CONFIG_MKISS
+ KCONFIG:= \
+ CONFIG_AX25 \
+ CONFIG_MKISS
FILES:= \
$(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
@@ -306,8 +317,16 @@ define KernelPackage/mp-alg
specifying which algorithm to use for routes. \\\
quagga (at least <=0.99.6) requires a multipath patch to support this \\\
cached mp route feature.
- KCONFIG:=CONFIG_IP_ROUTE_MULTIPATH_RR CONFIG_IP_ROUTE_MULTIPATH_RANDOM CONFIG_IP_ROUTE_MULTIPATH_WRANDOM CONFIG_IP_ROUTE_MULTIPATH_DRR
- FILES:=$(LINUX_DIR)/net/ipv4/multipath_*.$(LINUX_KMOD_SUFFIX)
+ KCONFIG:= \
+ CONFIG_IP_ROUTE_MULTIPATH_RR \
+ CONFIG_IP_ROUTE_MULTIPATH_RANDOM \
+ CONFIG_IP_ROUTE_MULTIPATH_WRANDOM \
+ CONFIG_IP_ROUTE_MULTIPATH_DRR
+ FILES:= \
+ $(LINUX_DIR)/net/ipv4/multipath_rr.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/ipv4/multipath_random.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/ipv4/multipath_wrandom.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/ipv4/multipath_drr.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
endef
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 0e04ae97a7..67e051aa28 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -72,7 +72,10 @@ define KernelPackage/lp
SUBMENU:=$(EMENU)
TITLE:=Parallel port and line printer support
DEPENDS:=@LINUX_2_4
- KCONFIG:=CONFIG_PARPORT
+ KCONFIG:= \
+ CONFIG_PARPORT \
+ CONFIG_PRINTER \
+ CONFIG_PPDEV
FILES:= \
$(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
@@ -96,17 +99,41 @@ define KernelPackage/soundcore/2.4
endef
define KernelPackage/soundcore/2.6
+ KCONFIG+= \
+ CONFIG_SND \
+ CONFIG_SND_HWDEP \
+ CONFIG_SND_RAWMIDI \
+ CONFIG_SND_TIMER \
+ CONFIG_SND_PCM
FILES:= \
$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/sound/core/*.$(LINUX_KMOD_SUFFIX) \
- $(if $(CONFIG_SND_MIXER_OSS)$(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/*.$(LINUX_KMOD_SUFFIX))
- AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss))
+ $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \
+ $(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \
+ $(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX))
+ AUTOLOAD:=$(call AutoLoad,30, \
+ soundcore \
+ snd \
+ snd-page-alloc \
+ snd-hwdep \
+ snd-rawmidi \
+ snd-timer \
+ snd-pcm \
+ $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
+ $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \
+ )
endef
define KernelPackage/soundcore/uml-2.6
+ KCONFIG+= \
+ CONFIG_HOSTAUDIO
FILES:= \
- $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
endef
@@ -142,8 +169,13 @@ define KernelPackage/capi
TITLE:=CAPI Support
DESCRIPTION:=Kernel module for basic CAPI support
DEPENDS:=@LINUX_2_6
- KCONFIG:=CONFIG_ISDN CONFIG_ISDN_CAPI CONFIG_ISDN_CAPI_CAPI20
- FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX)
+ KCONFIG:= \
+ CONFIG_ISDN \
+ CONFIG_ISDN_CAPI \
+ CONFIG_ISDN_CAPI_CAPI20
+ FILES:= \
+ $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
endef
@@ -155,31 +187,44 @@ define KernelPackage/pcmcia-core
TITLE:=PCMCIA/CardBus support
DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
DEPENDS:=@PCMCIA_SUPPORT
- KCONFIG:=CONFIG_PCMCIA CONFIG_PCCARD CONFIG_PCMCIA_AU1X00
endef
-ifneq ($(CONFIG_LINUX_2_6_AU1000),)
- PCMCIA_SOCKET_DRIVER:=au1x00_ss
-else
- PCMCIA_SOCKET_DRIVER:=yenta_socket
-endif
-
define KernelPackage/pcmcia-core/2.4
+ KCONFIG:= \
+ CONFIG_PCMCIA \
+ CONFIG_CARDBUS
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/pcmcia/$(PCMCIA_SOCKET_DRIVER).$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,40,pcmcia_core $(PCMCIA_SOCKET_DRIVER) ds)
+ $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,40,pcmcia_core yenta_socket ds)
endef
define KernelPackage/pcmcia-core/2.6
+ KCONFIG:= \
+ CONFIG_PCCARD \
+ CONFIG_PCMCIA \
+ CONFIG_YENTA \
+ CONFIG_PCCARD_NONSTATIC \
+ PCMCIA_DEBUG=n
+ FILES:= \
+ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
+endef
+
+define KernelPackage/pcmcia-core/au1000-2.6
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/pcmcia/$(PCMCIA_SOCKET_DRIVER).$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic $(PCMCIA_SOCKET_DRIVER))
+ $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/pcmcia/au1x00_ss.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic au1x00_ss)
endef
+
$(eval $(call KernelPackage,pcmcia-core))
@@ -188,15 +233,16 @@ define KernelPackage/pcmcia-serial
TITLE:=Serial devices support
DESCRIPTION:=Kernel support for PCMCIA/CardBus serial devices
DEPENDS:=kmod-pcmcia-core
- KCONFIG:=CONFIG_PCMCIA_SERIAL_CS CONFIG_SERIAL_8250_CS
AUTOLOAD:=$(call AutoLoad,45,serial_cs)
endef
define KernelPackage/pcmcia-serial/2.4
+ KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
endef
define KernelPackage/pcmcia-serial/2.6
+ KCONFIG:=CONFIG_SERIAL_8250_CS
FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
endef
@@ -208,10 +254,17 @@ define KernelPackage/bluetooth
TITLE:=Bluetooth support
DEPENDS:=@USB_SUPPORT
DESCRIPTION:=Kernel support for Bluetooth devices
- KCONFIG:=CONFIG_BLUEZ CONFIG_BT CONFIG_USB_BLUETOOTH
- endef
+endef
- define KernelPackage/bluetooth/2.4
+define KernelPackage/bluetooth/2.4
+ KCONFIG:= \
+ CONFIG_BLUEZ \
+ CONFIG_BLUEZ_L2CAP \
+ CONFIG_BLUEZ_SCO \
+ CONFIG_BLUEZ_RFCOMM \
+ CONFIG_BLUEZ_BNEP \
+ CONFIG_BLUEZ_HCIUART \
+ CONFIG_BLUEZ_HCIUSB
FILES:= \
$(LINUX_DIR)/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -224,6 +277,14 @@ define KernelPackage/bluetooth
endef
define KernelPackage/bluetooth/2.6
+ KCONFIG:= \
+ CONFIG_BT \
+ CONFIG_BT_L2CAP \
+ CONFIG_BT_SCO \
+ CONFIG_BT_RFCOMM \
+ CONFIG_BT_BNEP \
+ CONFIG_BT_HCIUSB \
+ CONFIG_BT_HCIUART
FILES:= \
$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -243,7 +304,10 @@ define KernelPackage/mmc
TITLE:=MMC/SD Card Support
DEPENDS:=@LINUX_2_6_AT91
DESCRIPTION:=Kernel support for MMC/SD cards
- KCONFIG:=CONFIG_MMC
+ KCONFIG:= \
+ CONFIG_MMC \
+ CONFIG_MMC_BLOCK \
+ CONFIG_MMC_AT91
FILES:= \
$(LINUX_DIR)/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \
@@ -278,15 +342,25 @@ define KernelPackage/videodev
TITLE=Video4Linux support
DESCRIPTION:=Kernel modules for Video4Linux support
KCONFIG:=CONFIG_VIDEO_DEV
- FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
endef
define KernelPackage/videodev/2.4
+ FILES:=$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,videodev)
endef
define KernelPackage/videodev/2.6
- AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat compat_ioctl32 videodev)
+ FILES:= \
+ $(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
+ $(if $(CONFIG_VIDEO_V4L1_COMPAT),$(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX)) \
+ $(LINUX_DIR)/drivers/media/video/compat_ioctl32.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,60, \
+ v4l2-common \
+ $(if $(CONFIG_VIDEO_V4L1_COMPAT),v4l1-compat) \
+ compat_ioctl32 \
+ videodev \
+ )
endef
$(eval $(call KernelPackage,videodev))
@@ -349,7 +423,10 @@ define KernelPackage/hwmon
TITLE:=Hardware monitoring support
DESCRIPTION:=Kernel modules for hardware monitoring
DEPENDS:=@LINUX_2_6
- KCONFIG:=CONFIG_HWMON_VID
+ KCONFIG:= \
+ CONFIG_HWMON \
+ CONFIG_HWMON_VID \
+ CONFIG_HWMON_DEBUG_CHIP=n
FILES:= \
$(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX)
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index f6991c248f..d089b44123 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -52,15 +52,16 @@ define KernelPackage/usb-uhci
$(call usbdep,)
TITLE:=Support for UHCI controllers
DESCRIPTION:=Kernel support for USB UHCI controllers
- KCONFIG:=CONFIG_USB_UHCI_ALT CONFIG_USB_UHCI_HCD
endef
define KernelPackage/usb-uhci/2.4
+ KCONFIG:=CONFIG_USB_UHCI_ALT
FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o
AUTOLOAD:=$(call AutoLoad,50,uhci)
endef
define KernelPackage/usb-uhci/2.6
+ KCONFIG:=CONFIG_USB_UHCI_HCD
FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
endef
@@ -84,15 +85,16 @@ define KernelPackage/usb-ohci
$(call usbdep,)
TITLE:=Support for OHCI controllers
DESCRIPTION:=Kernel support for USB OHCI controllers
- KCONFIG:=CONFIG_USB_OHCI CONFIG_USB_OHCI_HCD
endef
define KernelPackage/usb-ohci/2.4
+ KCONFIG:=CONFIG_USB_OHCI
FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o
AUTOLOAD:=$(call AutoLoad,50,usb-ohci)
endef
define KernelPackage/usb-ohci/2.6
+ KCONFIG:=CONFIG_USB_OHCI_HCD
FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
endef
@@ -148,15 +150,16 @@ define KernelPackage/usb-audio
$(call usbdep,+kmod-soundcore)
TITLE:=Support for audio devices
DESCRIPTION:=Kernel support for USB audio devices
- KCONFIG:=CONFIG_USB_AUDIO CONFIG_SND_USB_AUDIO
endef
define KernelPackage/usb-audio/2.4
+ KCONFIG:=CONFIG_USB_AUDIO
FILES:=$(LINUX_DIR)/drivers/usb/audio.o
AUTOLOAD:=$(call AutoLoad,60,audio)
endef
define KernelPackage/usb-audio/2.6
+ KCONFIG:=CONFIG_SND_USB_AUDIO
FILES:= \
$(LINUX_DIR)/sound/usb/snd-usb-lib.ko \
$(LINUX_DIR)/sound/usb/snd-usb-audio.ko
@@ -287,19 +290,19 @@ define KernelPackage/usb-serial-keyspan
TITLE:=Support for Keyspan USB-to-Serial devices
DESCRIPTION:=Kernel support for Keyspan USB-to-Serial devices
KCONFIG:= \
- $(CONFIG_USB_SERIAL_KEYSPAN) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA28) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA28X) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA28XA) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA28XB) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA19) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA18X) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA19W) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA19QW) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA19QI) \
- $(CONFIG_USB_SERIAL_KEYSPAN_MPR) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA49W) \
- $(CONFIG_USB_SERIAL_KEYSPAN_USA49WLC)
+ CONFIG_USB_SERIAL_KEYSPAN \
+ CONFIG_USB_SERIAL_KEYSPAN_USA28 \
+ CONFIG_USB_SERIAL_KEYSPAN_USA28X \
+ CONFIG_USB_SERIAL_KEYSPAN_USA28XA \
+ CONFIG_USB_SERIAL_KEYSPAN_USA28XB \
+ CONFIG_USB_SERIAL_KEYSPAN_USA19 \
+ CONFIG_USB_SERIAL_KEYSPAN_USA18X \
+ CONFIG_USB_SERIAL_KEYSPAN_USA19W \
+ CONFIG_USB_SERIAL_KEYSPAN_USA19QW \
+ CONFIG_USB_SERIAL_KEYSPAN_USA19QI \
+ CONFIG_USB_SERIAL_KEYSPAN_MPR \
+ CONFIG_USB_SERIAL_KEYSPAN_USA49W \
+ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC
FILES:=$(LINUX_DIR)/drivers/usb/serial/keyspan.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,65,keyspan)
endef
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 416706cd2f..abe261aef1 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -20,9 +20,17 @@ define KernelPackage/ieee80211
- ieee80211_crypt_tkip \\\
- ieee80211_crytp_ccmp
DEPENDS:=@LINUX_2_6 +kmod-crypto
- KCONFIG:=CONFIG_IEEE80211
+ KCONFIG:= \
+ CONFIG_IEEE80211 \
+ CONFIG_IEEE80211_CRYPT_WEP \
+ CONFIG_IEEE80211_CRYPT_CCMP \
+ CONFIG_IEEE80211_CRYPT_TKIP
FILES:= \
- $(LINUX_DIR)/net/ieee80211/*.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/net/ieee80211/ieee80211_crypt.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/ieee80211/ieee80211.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,10, \
ieee80211_crypt \
ieee80211 \
@@ -40,8 +48,7 @@ define KernelPackage/ieee80211-softmac
TITLE:=ieee80211 SoftMAC support
DEPENDS:=kmod-ieee80211
KCONFIG:=CONFIG_IEEE80211_SOFTMAC
- FILES:= \
- $(LINUX_DIR)/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+ FILES:=$(LINUX_DIR)/net/ieee80211/softmac/ieee80211softmac.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
endef
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 20:01:49 +0000