update config files

SVN-Revision: 10901

2 files changed, 35 insertions, 0 deletions

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index af8139301c..08ef4fc77c 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -193,6 +193,7 @@ CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_SCO=m
 CONFIG_BUG=y
+# CONFIG_CAN is not set
 # CONFIG_CAPI_AVM is not set
 # CONFIG_CAPI_EICON is not set
 # CONFIG_CAPI_TRACE is not set
@@ -223,6 +224,7 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
 CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set
+# CONFIG_COMPAT_BRK is not set
 CONFIG_CONFIGFS_FS=y
 # CONFIG_CONNECTOR is not set
 # CONFIG_CRAMFS is not set
@@ -244,25 +246,31 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_GCM=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_HW=n
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=m
 # CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
@@ -320,6 +328,7 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_EMBEDDED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
@@ -363,6 +372,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
+# CONFIG_GROUP_SCHED is not set
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
@@ -720,11 +730,13 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_MAC_PARTITION=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
+# CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MD is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_SAS is not set
+# CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_SM501 is not set
 CONFIG_MII=y
 CONFIG_MINIX_FS=m
@@ -757,6 +769,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
+# CONFIG_NAMESPACES is not set
 # CONFIG_NCP_FS is not set
 CONFIG_NET=y
 # CONFIG_NET_ACT_NAT is not set
@@ -767,8 +780,11 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -780,16 +796,19 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PORTSCAN=m
 # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
@@ -806,8 +825,10 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_TARPIT=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
@@ -824,6 +845,7 @@ CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_IND=y
 CONFIG_NET_CLS_POLICE=y
@@ -881,6 +903,7 @@ CONFIG_NET_WIRELESS=y
 CONFIG_NET_WIRELESS_RTNETLINK=y
 # CONFIG_NEW_GPIO is not set
 CONFIG_NEW_LEDS=y
+# CONFIG_NF_CT_NETLINK is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
@@ -971,6 +994,7 @@ CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m
 # CONFIG_NO_HZ is not set
+# CONFIG_NOZOMI is not set
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
@@ -1027,6 +1051,7 @@ CONFIG_PATA_PLATFORM=m
 # CONFIG_PATA_WINBOND_VLB is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
+# CONFIG_PCF8575 is not set
 CONFIG_PCI=y
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
@@ -1080,6 +1105,7 @@ CONFIG_PRINTK=y
 CONFIG_PRISM54=m
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
+# CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
 # CONFIG_QEMU is not set
@@ -1120,9 +1146,11 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_RTC_CLASS is not set
 CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
@@ -1219,7 +1247,9 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADS7828 is not set
 # CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
@@ -1276,6 +1306,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
@@ -1454,6 +1485,7 @@ CONFIG_SYSCTL=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_SYSVIPC=y
 # CONFIG_SYSV_FS is not set
@@ -1487,6 +1519,7 @@ CONFIG_TIMERFD=y
 CONFIG_TMD_HERMES=m
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_TPS65010 is not set
 # CONFIG_TR is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TUN=m
diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index fe6e5cc48c..69cbd67a78 100644
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -28,10 +28,12 @@ CONFIG_ARCH_IXP4XX=y
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_MSM7X00A is not set
 # CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_ORION is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PRPMC1100 is not set
 # CONFIG_ARCH_PXA is not set