diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-05-26 20:08:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-05-26 20:08:21 +0000 |
| commit | f570acf1c72de47eb392781208c8bf5abb253ab2 (patch) | |
| tree | 9f602a3bf5da30ba955e333a725a5daa19764b9f /target/linux/generic-2.6 | |
| parent | 0c1b2d68c38344790260749f387cbe8d04b8c674 (diff) | |
| download | master-187ad058-f570acf1c72de47eb392781208c8bf5abb253ab2.tar.gz master-187ad058-f570acf1c72de47eb392781208c8bf5abb253ab2.tar.bz2 master-187ad058-f570acf1c72de47eb392781208c8bf5abb253ab2.zip | |
sync atheros-2.6 config, move parts to the generic config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7348 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/config-template | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template index 4729f28737..949d750a91 100644 --- a/target/linux/generic-2.6/config-template +++ b/target/linux/generic-2.6/config-template @@ -339,8 +339,15 @@ CONFIG_HOTPLUG=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set +CONFIG_HZ=100 +CONFIG_HZ_100=y # CONFIG_HZ_1000 is not set +# CONFIG_HZ_1024 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set # CONFIG_HZ_300 is not set +# CONFIG_HZ_48 is not set # CONFIG_I2C_ALGOPCA is not set # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALI1535 is not set @@ -774,6 +781,7 @@ CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y # CONFIG_NFTL is not set +CONFIG_NF_CONNTRACK=y # CONFIG_NF_CONNTRACK_AMANDA is not set CONFIG_NF_CONNTRACK_ENABLED=y # CONFIG_NF_CONNTRACK_EVENTS is not set @@ -782,7 +790,7 @@ CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IPV4=y # CONFIG_NF_CONNTRACK_IPV6 is not set CONFIG_NF_CONNTRACK_IRC=m -# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CONNTRACK_MARK=y # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set # CONFIG_NF_CONNTRACK_PPTP is not set CONFIG_NF_CONNTRACK_PROC_COMPAT=y @@ -790,10 +798,18 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SUPPORT=y # CONFIG_NF_CONNTRACK_TFTP is not set -# CONFIG_NF_CT_ACCT is not set +CONFIG_NF_CT_ACCT=y # CONFIG_NF_CT_PROTO_SCTP is not set CONFIG_NF_NAT=y +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_NEEDED=y +# CONFIG_NF_NAT_PPTP is not set +CONFIG_NF_NAT_SIP=m # CONFIG_NF_NAT_SNMP_BASIC is not set +# CONFIG_NF_NAT_TFTP is not set CONFIG_NLS=m # CONFIG_NLS_ASCII is not set CONFIG_NLS_CODEPAGE_1250=m @@ -1527,3 +1543,5 @@ CONFIG_ZISOFS=y CONFIG_ZISOFS_FS=m CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZONE_DMA=y +CONFIG_ZONE_DMA_FLAG=1 |