ramips: sync kernel config

SVN-Revision: 22170

diff --git a/target/linux/ramips/rt288x/config-2.6.34 b/target/linux/ramips/rt288x/config-2.6.34
index 21cdfa53eea8ba4e5b70e035df2b917efe2ff44a..42e0515dce7d27af7b527ed81505628ed4033818 100644 (file)
--- a/target/linux/ramips/rt288x/config-2.6.34
+++ b/target/linux/ramips/rt288x/config-2.6.34
@@ -14,11 +14,9 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
 CONFIG_BITREVERSE=y
-CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CEPH_FS is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS1,57600 rootfstype=squashfs,jffs2"
@@ -55,14 +53,12 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYSTALHD is not set
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NONCOHERENT=y
-# CONFIG_DT3155 is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_FSNOTIFY is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -73,7 +69,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SCH is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
@@ -92,17 +87,9 @@ CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=m
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 CONFIG_IRQ_CPU=y
-# CONFIG_KSZ884X_PCI is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LOONGSON_UART_BASE=y
-# CONFIG_LPC_SCH is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -110,7 +97,6 @@ CONFIG_LOONGSON_UART_BASE=y
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set
-# CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MII is not set
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y

diff --git a/target/linux/ramips/rt305x/config-2.6.34 b/target/linux/ramips/rt305x/config-2.6.34
index d2b6311af430526bd161ef66de3f5c1b560efed3..513224a3cde715a54f5695fbe7aa705e3899d2e8 100644 (file)
--- a/target/linux/ramips/rt305x/config-2.6.34
+++ b/target/linux/ramips/rt305x/config-2.6.34
@@ -14,11 +14,9 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_BCM47XX is not set
 # CONFIG_BCM63XX is not set
 CONFIG_BITREVERSE=y
-CONFIG_BRIDGE_IGMP_SNOOPING=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_CEPH_FS is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS1,57600 rootfstype=squashfs,jffs2"
@@ -87,12 +85,6 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_RANDOM=m
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 CONFIG_IRQ_CPU=y
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LOONGSON_UART_BASE=y