iwlwifi-2.6: Cleans up set_key flow

[linux-2.6-omap-h63xx.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 64e5148d82bc8cce2018012f6bf5587570ba2267..b6d230b3209f24567be22208be6d8236af88282d 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -322,7 +322,7 @@ config BLK_DEV_UB
          If unsure, say N.
 
 config BLK_DEV_RAM
-       tristate "RAM disk support"
+       tristate "RAM block device support"
        ---help---
          Saying Y here will allow you to use a portion of your RAM memory as
          a block device, so that you can make file systems on it, read and
@@ -357,15 +357,15 @@ config BLK_DEV_RAM_SIZE
          The default value is 4096 kilobytes. Only change this if you know
          what you are doing.
 
-config BLK_DEV_RAM_BLOCKSIZE
-       int "Default RAM disk block size (bytes)"
+config BLK_DEV_XIP
+       bool "Support XIP filesystems on RAM block device"
        depends on BLK_DEV_RAM
-       default "1024"
+       default n
        help
-         The default value is 1024 bytes.  PAGE_SIZE is a much more
-         efficient choice however.  The default is kept to ensure initrd
-         setups function - apparently needed by the rd_load_image routine
-         that supposes the filesystem in the image uses a 1024 blocksize.
+         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"