[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/ar71xx/config-2.6.29 b/target/linux/ar71xx/config-2.6.29
index ac34443..ab7312e 100644 (file)
--- a/target/linux/ar71xx/config-2.6.29
+++ b/target/linux/ar71xx/config-2.6.29
@@ -172,7 +172,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROM_EMU=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -199,9 +198,6 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO_OLD is not set
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
-# CONFIG_SSB_DRIVER_MIPS is not set
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y