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, 10 insertions, 10 deletions

diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index 89f8e66448ab..a90bfe79916d 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -27,12 +27,12 @@ static int get_sb_mtd_compare(struct super_block *sb, void *_mtd)
         struct mtd_info *mtd = _mtd;
 
         if (sb->s_mtd == mtd) {
-                DEBUG(2, "MTDSB: Match on device %d (\"%s\")\n",
+                pr_debug("MTDSB: Match on device %d (\"%s\")\n",
                       mtd->index, mtd->name);
                 return 1;
         }
 
-        DEBUG(2, "MTDSB: No match, device %d (\"%s\"), device %d (\"%s\")\n",
+        pr_debug("MTDSB: No match, device %d (\"%s\"), device %d (\"%s\")\n",
               sb->s_mtd->index, sb->s_mtd->name, mtd->index, mtd->name);
         return 0;
 }
@@ -71,7 +71,7 @@ static struct dentry *mount_mtd_aux(struct file_system_type *fs_type, int flags,
                 goto already_mounted;
 
         /* fresh new superblock */
-        DEBUG(1, "MTDSB: New superblock for device %d (\"%s\")\n",
+        pr_debug("MTDSB: New superblock for device %d (\"%s\")\n",
               mtd->index, mtd->name);
 
         sb->s_flags = flags;
@@ -88,7 +88,7 @@ static struct dentry *mount_mtd_aux(struct file_system_type *fs_type, int flags,
 
         /* new mountpoint for an already mounted superblock */
 already_mounted:
-        DEBUG(1, "MTDSB: Device %d (\"%s\") is already mounted\n",
+        pr_debug("MTDSB: Device %d (\"%s\") is already mounted\n",
               mtd->index, mtd->name);
         put_mtd_device(mtd);
         return dget(sb->s_root);
@@ -109,7 +109,7 @@ static struct dentry *mount_mtd_nr(struct file_system_type *fs_type, int flags,
 
         mtd = get_mtd_device(NULL, mtdnr);
         if (IS_ERR(mtd)) {
-                DEBUG(0, "MTDSB: Device #%u doesn't appear to exist\n", mtdnr);
+                pr_debug("MTDSB: Device #%u doesn't appear to exist\n", mtdnr);
                 return ERR_CAST(mtd);
         }
 
@@ -132,7 +132,7 @@ struct dentry *mount_mtd(struct file_system_type *fs_type, int flags,
         if (!dev_name)
                 return ERR_PTR(-EINVAL);
 
-        DEBUG(2, "MTDSB: dev_name \"%s\"\n", dev_name);
+        pr_debug("MTDSB: dev_name \"%s\"\n", dev_name);
 
         /* the preferred way of mounting in future; especially when
          * CONFIG_BLOCK=n - we specify the underlying MTD device by number or
@@ -143,7 +143,7 @@ struct dentry *mount_mtd(struct file_system_type *fs_type, int flags,
                         struct mtd_info *mtd;
 
                         /* mount by MTD device name */
-                        DEBUG(1, "MTDSB: mtd:%%s, name \"%s\"\n",
+                        pr_debug("MTDSB: mtd:%%s, name \"%s\"\n",
                               dev_name + 4);
 
                         mtd = get_mtd_device_nm(dev_name + 4);
@@ -164,7 +164,7 @@ struct dentry *mount_mtd(struct file_system_type *fs_type, int flags,
                         mtdnr = simple_strtoul(dev_name + 3, &endptr, 0);
                         if (!*endptr) {
                                 /* It was a valid number */
-                                DEBUG(1, "MTDSB: mtd%%d, mtdnr %d\n",
+                                pr_debug("MTDSB: mtd%%d, mtdnr %d\n",
                                       mtdnr);
                                 return mount_mtd_nr(fs_type, flags,
                                                      dev_name, data,
@@ -180,10 +180,10 @@ struct dentry *mount_mtd(struct file_system_type *fs_type, int flags,
         bdev = lookup_bdev(dev_name);
         if (IS_ERR(bdev)) {
                 ret = PTR_ERR(bdev);
-                DEBUG(1, "MTDSB: lookup_bdev() returned %d\n", ret);
+                pr_debug("MTDSB: lookup_bdev() returned %d\n", ret);
                 return ERR_PTR(ret);
         }
-        DEBUG(1, "MTDSB: lookup_bdev() returned 0\n");
+        pr_debug("MTDSB: lookup_bdev() returned 0\n");
 
         ret = -EINVAL;