upgrade x86 to 2.6.31.6, resync patches

[openwrt.git] / target / linux / generic-2.6 / config-2.6.30

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index db4c12b..62f05d6 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -564,6 +564,7 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_FUSE_FS is not set
 # CONFIG_FUSION_FC is not set
@@ -688,6 +689,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_IBM_IIC is not set
 # CONFIG_I2C_ISCH is not set
+# CONFIG_I2C is not set
 # CONFIG_I2C_MPC is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
@@ -1090,6 +1092,7 @@ CONFIG_MII=y
 CONFIG_MINI_FO=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_FPU_EMU is not set
 CONFIG_MISC_DEVICES=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISDN_HFCPCI is not set
@@ -1233,6 +1236,7 @@ CONFIG_NET_CLS_IND=y
 # CONFIG_NET_CLS_TCINDEX is not set
 # CONFIG_NET_CLS_U32 is not set
 CONFIG_NET_CLS=y
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETDEBUG is not set
 # CONFIG_NETDEV_10000 is not set
@@ -1542,6 +1546,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
 CONFIG_PCI=y
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
@@ -1560,6 +1565,7 @@ CONFIG_PCI=y
 # CONFIG_PCMCIA_WAVELAN is not set
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
 # CONFIG_PD6729 is not set
 # CONFIG_PDC_ADMA is not set
 # CONFIG_PHANTOM is not set
@@ -1920,6 +1926,7 @@ CONFIG_SLAB=y
 # CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_SMC911X is not set
 # CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SMSC9420 is not set
 # CONFIG_SMSC_PHY is not set