Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.

1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 66b616ebe536..318a869286ab 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -12,27 +12,17 @@ menuconfig MTD
 
 if MTD
 
-config MTD_DEBUG
-        bool "Debugging"
-        help
-          This turns on low-level debugging for the entire MTD sub-system.
-          Normally, you should say 'N'.
-
-config MTD_DEBUG_VERBOSE
-        int "Debugging verbosity (0 = quiet, 3 = noisy)"
-        depends on MTD_DEBUG
-        default "0"
-        help
-          Determines the verbosity level of the MTD debugging messages.
-
 config MTD_TESTS
-        tristate "MTD tests support"
+        tristate "MTD tests support (DANGEROUS)"
         depends on m
         help
           This option includes various MTD tests into compilation. The tests
           should normally be compiled as kernel modules. The modules perform
           various checks and verifications when loaded.
 
+          WARNING: some of the tests will ERASE entire MTD device which they
+          test. Do not use these tests unless you really know what you do.
+
 config MTD_REDBOOT_PARTS
         tristate "RedBoot partition table parsing"
         ---help---
@@ -137,7 +127,8 @@ config MTD_AFS_PARTS
           'physmap' map driver (CONFIG_MTD_PHYSMAP) does this, for example.
 
 config MTD_OF_PARTS
-        def_bool y
+        tristate "OpenFirmware partitioning information support"
+        default Y
         depends on OF
         help
           This provides a partition parsing function which derives