target/linux: revert r24014 (further testing is needed)

[openwrt.git] / target / linux / rb532 / config-2.6.34

diff --git a/target/linux/rb532/config-2.6.34 b/target/linux/rb532/config-2.6.34
index c3b498c..a274d79 100644 (file)
--- a/target/linux/rb532/config-2.6.34
+++ b/target/linux/rb532/config-2.6.34
@@ -17,8 +17,6 @@ CONFIG_ATA=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BOOT_RAW=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BOOT_RAW=y

-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y

 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set


@@ -58,19 +56,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_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_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y

-# CONFIG_DEBUG_FS is not set

 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_LZMA=y

-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set

 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set

-CONFIG_DMA_NEED_PCI_MAP_STATE=y

 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NONCOHERENT=y

-# CONFIG_DT3155 is not set

 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EXT2_FS=y
 # CONFIG_FSNOTIFY is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EXT2_FS=y
 # CONFIG_FSNOTIFY is not set


@@ -105,48 +96,15 @@ CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y

-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y

 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""

-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set

 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
 CONFIG_KORINA=y
 # CONFIG_KSZ884X_PCI is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_MIKROTIK_RB532=y
 CONFIG_IRQ_CPU=y
 CONFIG_KEXEC=y
 CONFIG_KORINA=y
 # CONFIG_KSZ884X_PCI is not set
 # CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_MIKROTIK_RB532=y

-CONFIG_LLC=m
-# CONFIG_LOGFS is not set

 CONFIG_LOONGSON_UART_BASE=y
 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
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set


@@ -154,7 +112,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_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set

-# CONFIG_MAX63XX_WATCHDOG is not set

 # CONFIG_MFD_TIMBERDALE is not set
 CONFIG_MIKROTIK_RB532=y
 CONFIG_MIPS=y
 # CONFIG_MFD_TIMBERDALE is not set
 CONFIG_MIKROTIK_RB532=y
 CONFIG_MIPS=y


@@ -178,7 +135,7 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set

-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
+CONFIG_NEED_DMA_MAP_STATE=y

 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CT_ACCT=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CT_ACCT=y
 # CONFIG_NO_IOPORT is not set


@@ -186,6 +143,7 @@ CONFIG_NF_CT_ACCT=y
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_RB532=y
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_RB532=y

+CONFIG_PCI=y

 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCSPKR_PLATFORM=y


@@ -198,10 +156,10 @@ CONFIG_RC32434_WDT=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set

+CONFIG_SCSI_MOD=y

 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

-# CONFIG_SERIAL_TIMBERDALE is not set

 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
 # CONFIG_SGI_IP28 is not set


@@ -214,9 +172,6 @@ CONFIG_SCSI=y
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set

-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_STP=m

 # CONFIG_SWAP is not set
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 # CONFIG_SWAP is not set
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y


@@ -228,7 +183,6 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_VIA_RHINE=y
 CONFIG_VIA_RHINE_MMIO=y
 # CONFIG_TREE_PREEMPT_RCU is not set
 CONFIG_VIA_RHINE=y
 CONFIG_VIA_RHINE_MMIO=y

-CONFIG_VLAN_8021Q=m

 CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_YAFFS_AUTO_YAFFS2=y
 CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_YAFFS_AUTO_YAFFS2=y