[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
index a9dcf20..fbd2006 100644 (file)
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -213,7 +213,6 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KMOD=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
-# CONFIG_LEDS_ALIX is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_M386=y
 # CONFIG_M486 is not set
@@ -257,37 +256,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_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_TS5500 is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
@@ -335,8 +306,6 @@ CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_R6040 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
@@ -366,13 +335,10 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_STATS is not set
 # CONFIG_SMP is not set
 # CONFIG_SMSC37B787_WDT is not set
-# CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
-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