Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6

MTD pull for 3.3

* tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
  mtd: Fix dependency for MTD_DOC200x
  mtd: do not use mtd->block_markbad directly
  logfs: do not use 'mtd->block_isbad' directly
  mtd: introduce mtd_can_have_bb helper
  mtd: do not use mtd->suspend and mtd->resume directly
  mtd: do not use mtd->lock, unlock and is_locked directly
  mtd: do not use mtd->sync directly
  mtd: harmonize mtd_writev usage
  mtd: do not use mtd->lock_user_prot_reg directly
  mtd: mtd->write_user_prot_reg directly
  mtd: do not use mtd->read_*_prot_reg directly
  mtd: do not use mtd->get_*_prot_info directly
  mtd: do not use mtd->read_oob directly
  mtd: mtdoops: do not use mtd->panic_write directly
  romfs: do not use mtd->get_unmapped_area directly
  mtd: do not use mtd->get_unmapped_area directly
  mtd: do use mtd->point directly
  mtd: introduce mtd_has_oob helper
  mtd: mtdcore: export symbols cleanup
  mtd: clean-up the default_mtd_writev function
  ...

Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index a2bde3744622..b34438e026be 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -404,8 +404,7 @@ static int __init init_axis_flash(void)
                  */
                 int blockstat;
                 do {
-                        blockstat = main_mtd->block_isbad(main_mtd,
-                                ptable_sector);
+                        blockstat = mtd_block_isbad(main_mtd, ptable_sector);
                         if (blockstat < 0)
                                 ptable_sector = 0; /* read error */
                         else if (blockstat)
@@ -413,8 +412,8 @@ static int __init init_axis_flash(void)
                 } while (blockstat && ptable_sector);
 #endif
                 if (ptable_sector) {
-                        main_mtd->read(main_mtd, ptable_sector, PAGESIZE,
-                                &len, page);
+                        mtd_read(main_mtd, ptable_sector, PAGESIZE, &len,
+                                 page);
                         ptable_head = &((struct partitiontable *) page)->head;
                 }