Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

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

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 8848e8ac705d9f22a35dce96d3fe788984cc52ed..a90d50c2c3e5535343e859c5df1c40c3be7e464a 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -1,5 +1,3 @@
-# $Id: Kconfig,v 1.11 2005/11/07 11:14:19 gleixner Exp $
-

 menuconfig MTD
        tristate "Memory Technology Device (MTD) support"
        depends on HAS_IOMEM
 menuconfig MTD
        tristate "Memory Technology Device (MTD) support"
        depends on HAS_IOMEM


@@ -150,6 +148,20 @@ config MTD_AFS_PARTS
          for your particular device. It won't happen automatically. The
          'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
 
          for your particular device. It won't happen automatically. The
          'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
 

+config MTD_OF_PARTS
+       tristate "Flash partition map based on OF description"
+       depends on PPC_OF && MTD_PARTITIONS
+       help
+         This provides a partition parsing function which derives
+         the partition map from the children of the flash node,
+         as described in Documentation/powerpc/booting-without-of.txt.
+
+config MTD_AR7_PARTS
+       tristate "TI AR7 partitioning support"
+       depends on MTD_PARTITIONS
+       ---help---
+         TI AR7 partitioning support
+

 comment "User Modules And Translation Layers"
 
 config MTD_CHAR
 comment "User Modules And Translation Layers"
 
 config MTD_CHAR


@@ -160,6 +172,11 @@ config MTD_CHAR
          memory chips, and also use ioctl() to obtain information about
          the device, or to erase parts of it.
 
          memory chips, and also use ioctl() to obtain information about
          the device, or to erase parts of it.
 

+config HAVE_MTD_OTP
+       bool
+       help
+         Enable access to OTP regions using MTD_CHAR.
+

 config MTD_BLKDEVS
        tristate "Common interface to block layer for MTD 'translation layers'"
        depends on BLOCK
 config MTD_BLKDEVS
        tristate "Common interface to block layer for MTD 'translation layers'"
        depends on BLOCK


@@ -286,6 +303,9 @@ config MTD_OOPS
          buffer in a flash partition where it can be read back at some
          later point.
 
          buffer in a flash partition where it can be read back at some
          later point.
 

+         To use, add console=ttyMTDx to the kernel command line,
+         where x is the MTD device number to use.
+

 source "drivers/mtd/chips/Kconfig"
 
 source "drivers/mtd/maps/Kconfig"
 source "drivers/mtd/chips/Kconfig"
 
 source "drivers/mtd/maps/Kconfig"