Merge branch 'bkl-removal' into next

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

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 661eac09f5cb1852ad8c99e641769bf9c730f0fc..eed06d068fd12f36f64c11a37ea0e3ea7c611d32 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -150,6 +150,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.
 
+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