[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 3ea6898..fc658a6 100644 (file)
--- a/target/linux/x86/config-2.6.29
+++ b/target/linux/x86/config-2.6.29
@@ -324,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
@@ -359,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