olpc: sdhci: add quirk for the Marvell CaFe's interrupt timeout

[linux-2.6] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 8be67cd3fe01b0635a75cf2ac3c942cda0b2e5a6..0d1d2133d9bc239fe800a3e64c05ceef6c1e898a 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -44,16 +44,6 @@ config MAC_FLOPPY
          If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
          floppy controller, say Y here. Most commonly found in PowerMacs.
 
          If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
          floppy controller, say Y here. Most commonly found in PowerMacs.
 

-config BLK_DEV_PS2
-       tristate "PS/2 ESDI hard disk support"
-       depends on MCA && MCA_LEGACY && BROKEN
-       help
-         Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
-         hard disk.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ps2esdi.
-

 config AMIGA_Z2RAM
        tristate "Amiga Zorro II ramdisk support"
        depends on ZORRO
 config AMIGA_Z2RAM
        tristate "Amiga Zorro II ramdisk support"
        depends on ZORRO


@@ -357,6 +347,16 @@ config BLK_DEV_RAM_SIZE
          The default value is 4096 kilobytes. Only change this if you know
          what you are doing.
 
          The default value is 4096 kilobytes. Only change this if you know
          what you are doing.
 

+config BLK_DEV_XIP
+       bool "Support XIP filesystems on RAM block device"
+       depends on BLK_DEV_RAM
+       default n
+       help
+         Support XIP filesystems (such as ext2 with XIP support on) on
+         top of block ram device. This will slightly enlarge the kernel, and
+         will prevent RAM block device backing store memory from being
+         allocated from highmem (only a problem for highmem systems).
+

 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media"
        depends on !UML
 config CDROM_PKTCDVD
        tristate "Packet writing on CD/DVD media"
        depends on !UML