[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / x86 / config-2.6.29

diff --git a/target/linux/x86/config-2.6.29 b/target/linux/x86/config-2.6.29
index 8b2fee4..fc658a6 100644 (file)
--- a/target/linux/x86/config-2.6.29
+++ b/target/linux/x86/config-2.6.29
@@ -271,39 +271,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_LPDDR is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_TS5500 is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
@@ -354,8 +324,6 @@ CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
@@ -389,10 +357,8 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SPARSE_IRQ is not set
-CONFIG_SSB_POSSIBLE=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SYSPROF_TRACER is not set
-CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TELCLOCK is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set