Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / mtd / Kconfig

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

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


@@ -278,6 +286,17 @@ config SSFDC
          This enables read only access to SmartMedia formatted NAND
          flash. You can mount it with FAT file system.
 
          This enables read only access to SmartMedia formatted NAND
          flash. You can mount it with FAT file system.
 

+config MTD_OOPS
+       tristate "Log panic/oops to an MTD buffer"
+       depends on MTD
+       help
+         This enables panic and oops messages to be logged to a circular
+         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"