[xburst] jz-mmc: Fix deadlock which could occur if the card was removed while a

[openwrt.git] / target / linux / brcm63xx / config-2.6.30

diff --git a/target/linux/brcm63xx/config-2.6.30 b/target/linux/brcm63xx/config-2.6.30
index 3e69265..853a30f 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.30
+++ b/target/linux/brcm63xx/config-2.6.30
@@ -7,11 +7,9 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y

-CONFIG_AUDIT=y

 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_GENERIC=y

-CONFIG_BASE_SMALL=0
+CONFIG_AUDIT=y

 # CONFIG_BCM47XX is not set
 # CONFIG_BCM47XX is not set

-CONFIG_BCM63XX=y

 CONFIG_BCM63XX_CPU_6338=y
 CONFIG_BCM63XX_CPU_6345=y
 CONFIG_BCM63XX_CPU_6348=y
 CONFIG_BCM63XX_CPU_6338=y
 CONFIG_BCM63XX_CPU_6345=y
 CONFIG_BCM63XX_CPU_6348=y


@@ -19,6 +17,7 @@ CONFIG_BCM63XX_CPU_6358=y
 CONFIG_BCM63XX_ENET=y
 CONFIG_BCM63XX_PHY=y
 CONFIG_BCM63XX_WDT=y
 CONFIG_BCM63XX_ENET=y
 CONFIG_BCM63XX_PHY=y
 CONFIG_BCM63XX_WDT=y

+CONFIG_BCM63XX=y

 CONFIG_BINARY_PRINTF=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_BINARY_PRINTF=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_IO_TRACE=y


@@ -28,8 +27,8 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y

-CONFIG_CEVT_R4K=y

 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CEVT_R4K_LIB=y

+CONFIG_CEVT_R4K=y

 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set


@@ -38,9 +37,9 @@ CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # CONFIG_CPU_LOONGSON2 is not set
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 # CONFIG_CPU_LOONGSON2 is not set

-CONFIG_CPU_MIPS32=y

 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set

+CONFIG_CPU_MIPS32=y

 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 CONFIG_CPU_MIPSR1=y
 # CONFIG_CPU_MIPS64_R1 is not set
 # CONFIG_CPU_MIPS64_R2 is not set
 CONFIG_CPU_MIPSR1=y


@@ -69,8 +68,8 @@ CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y

-CONFIG_CSRC_R4K=y

 CONFIG_CSRC_R4K_LIB=y
 CONFIG_CSRC_R4K_LIB=y

+CONFIG_CSRC_R4K=y

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


@@ -80,15 +79,15 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_ELF_CORE=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FTRACE_STARTUP_TEST is not set

-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

-CONFIG_GPIOLIB=y

 CONFIG_GPIO_DEVICE=y
 CONFIG_GPIO_DEVICE=y

+CONFIG_GPIOLIB=y

 CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDWARE_WATCHPOINTS=y


@@ -102,17 +101,15 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y

-CONFIG_HZ=250

 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_100 is not set

+CONFIG_HZ=250

 CONFIG_HZ_250=y
 CONFIG_HZ_250=y

-# CONFIG_I2C is not set

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INITRAMFS_SOURCE=""

-CONFIG_INOTIFY=y

 CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY_USER=y

+CONFIG_INOTIFY=y

 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IRQ_CPU=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IRQ_CPU=y

-# CONFIG_ISDN is not set

 CONFIG_KEXEC=y
 CONFIG_LBD=y
 CONFIG_LEDS_GPIO=y
 CONFIG_KEXEC=y
 CONFIG_LBD=y
 CONFIG_LEDS_GPIO=y


@@ -126,9 +123,7 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MIKROTIK_RB532 is not set

-CONFIG_MIPS=y

 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_COBALT is not set

-# CONFIG_MIPS_FPU_EMU is not set

 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set


@@ -136,6 +131,7 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SIM is not set

+CONFIG_MIPS=y

 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_BCM963XX=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MTD_BCM963XX=y


@@ -148,33 +144,30 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_JEDECPROBE=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_JEDECPROBE=y

-CONFIG_MTD_REDBOOT_PARTS=y

 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y

-# CONFIG_NATSEMI is not set
+CONFIG_MTD_REDBOOT_PARTS=y

 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DROP_MONITOR is not set

-CONFIG_NOP_TRACER=y

 # CONFIG_NO_IOPORT is not set
 # CONFIG_NO_IOPORT is not set

+CONFIG_NOP_TRACER=y

 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 CONFIG_PAGEFLAGS_EXTENDED=y

-CONFIG_PCI=y

 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS=y

-# CONFIG_PCSPKR_PLATFORM is not set

 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set

-CONFIG_POSIX_MQUEUE=y

 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y

+CONFIG_POSIX_MQUEUE=y

 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_RELAY=y
 CONFIG_RING_BUFFER=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_RELAY=y
 CONFIG_RING_BUFFER=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set

-CONFIG_SERIAL_BCM63XX=y

 CONFIG_SERIAL_BCM63XX_CONSOLE=y
 CONFIG_SERIAL_BCM63XX_CONSOLE=y

+CONFIG_SERIAL_BCM63XX=y

 # 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


@@ -189,14 +182,14 @@ CONFIG_SERIAL_BCM63XX_CONSOLE=y
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SQUASHFS_EMBEDDED=y
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SQUASHFS_EMBEDDED=y

-CONFIG_SSB=y

 CONFIG_SSB_B43_PCI_BRIDGE=y
 # CONFIG_SSB_DRIVER_MIPS is not set
 CONFIG_SSB_B43_PCI_BRIDGE=y
 # CONFIG_SSB_DRIVER_MIPS is not set

-CONFIG_SSB_DRIVER_PCICORE=y

 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y

-CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_DRIVER_PCICORE=y

 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y

+CONFIG_SSB_PCIHOST=y

 CONFIG_SSB_SPROM=y
 CONFIG_SSB_SPROM=y

+CONFIG_SSB=y

 CONFIG_STACKTRACE=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_STACKTRACE=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y


@@ -205,10 +198,9 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_TC35815 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_TC35815 is not set

-CONFIG_TICK_ONESHOT=y

 CONFIG_TRACEPOINTS=y
 CONFIG_TRACEPOINTS=y

-CONFIG_TRACING=y

 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRACING_SUPPORT=y

+CONFIG_TRACING=y

 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y