Resync kernel configuration with generic-2.6

SVN-Revision: 7353

diff --git a/target/linux/ar7-2.6/config/default b/target/linux/ar7-2.6/config/default
index 18d62f21129828b8ed7e2bdb39d38769bf7088dc..535ae79a8c212f099b5e92acac942971d2967ed7 100644 (file)
--- 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