Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / mtd / Kconfig

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 8bab6f8..796a2ec 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -45,10 +45,9 @@ config MTD_BLOCK
          on RAM chips in this manner. This block device is a user of MTD
          devices performing that function.
 
-         At the moment, it is also required for the Journalling Flash File
-         System(s) to obtain a handle on the MTD device when it's mounted
-         (although JFFS and JFFS2 don't actually use any of the functionality
-         of the mtdblock device).
+         Note that mounting a JFFS2 filesystem doesn't require using mtdblock.
+         It's possible to mount a rootfs using the MTD device on the "root="
+         bootargs as "root=mtd2" or "root=mtd:name_of_device".
 
          Later, it may be extended to perform read/erase/modify/write cycles
          on flash chips to emulate a smaller block size. Needless to say,
@@ -70,6 +69,9 @@ config MTD_BLOCK_RO
          You do not need this option for use with the DiskOnChip devices. For
          those, enable NFTL support (CONFIG_NFTL) instead.
 
+comment "Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK."
+       depends on MTD_BLOCK || MTD_BLOCK_RO
+
 config FTL
        tristate "FTL (Flash Translation Layer) support"
        depends on BLOCK