diff options
author | Florian Fainelli <florian@openwrt.org> | 2007-05-27 17:57:50 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2007-05-27 17:57:50 +0000 |
commit | 91054cdc53951b66c81a2caf323190cf523b8dc4 (patch) | |
tree | 0e93abe1d61b2c03166898b0707dbaa7f0ad9371 /target/linux | |
parent | 5828d7a876655d83b1c74be8aa14db4bd793936a (diff) | |
download | master-187ad058-91054cdc53951b66c81a2caf323190cf523b8dc4.tar.gz master-187ad058-91054cdc53951b66c81a2caf323190cf523b8dc4.tar.bz2 master-187ad058-91054cdc53951b66c81a2caf323190cf523b8dc4.zip |
Resync kernel configuration with generic-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7353 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/ar7-2.6/config/default | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/target/linux/ar7-2.6/config/default b/target/linux/ar7-2.6/config/default index 18d62f2112..535ae79a8c 100644 --- a/target/linux/ar7-2.6/config/default +++ b/target/linux/ar7-2.6/config/default @@ -53,6 +53,7 @@ CONFIG_FIXED_MII_100_FDX=y CONFIG_FIXED_PHY=y CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_GPIO=y # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set # CONFIG_GEN_RTC is not set CONFIG_HAS_IOMEM=y @@ -62,13 +63,6 @@ CONFIG_HAS_IOPORT=y # CONFIG_HOSTAP_PLX is not set CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=y -CONFIG_HZ=100 -CONFIG_HZ_100=y -# 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_48 is not set # CONFIG_I2C is not set # CONFIG_IDE is not set # CONFIG_IPW2100 is not set @@ -165,17 +159,6 @@ CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_NET_PCI is not set CONFIG_NET_SCH_FIFO=y # CONFIG_NET_VENDOR_3COM is not set -CONFIG_NF_CONNTRACK=y -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CT_ACCT=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_TFTP is not set CONFIG_NODES_SHIFT=6 # CONFIG_PAGE_SIZE_16KB is not set CONFIG_PAGE_SIZE_4KB=y @@ -221,5 +204,3 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y CONFIG_TRAD_SIGNALS=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_USB is not set -CONFIG_ZONE_DMA=y -CONFIG_ZONE_DMA_FLAG=1 |