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, 12 insertions, 0 deletions

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 283d887f7825..37b05c3f2792 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -191,6 +191,7 @@ comment "Disk-On-Chip Device Drivers"
 
 config MTD_DOC2000
         tristate "M-Systems Disk-On-Chip 2000 and Millennium (DEPRECATED)"
+        depends on MTD_NAND
         select MTD_DOCPROBE
         select MTD_NAND_IDS
         ---help---
@@ -213,6 +214,7 @@ config MTD_DOC2000
 
 config MTD_DOC2001
         tristate "M-Systems Disk-On-Chip Millennium-only alternative driver (DEPRECATED)"
+        depends on MTD_NAND
         select MTD_DOCPROBE
         select MTD_NAND_IDS
         ---help---
@@ -234,6 +236,7 @@ config MTD_DOC2001
 
 config MTD_DOC2001PLUS
         tristate "M-Systems Disk-On-Chip Millennium Plus"
+        depends on MTD_NAND
         select MTD_DOCPROBE
         select MTD_NAND_IDS
         ---help---
@@ -251,6 +254,8 @@ config MTD_DOC2001PLUS
 
 config MTD_DOCG3
         tristate "M-Systems Disk-On-Chip G3"
+        select BCH
+        select BCH_CONST_PARAMS
         ---help---
           This provides an MTD device driver for the M-Systems DiskOnChip
           G3 devices.
@@ -259,6 +264,13 @@ config MTD_DOCG3
           M-Systems and now Sandisk. The support is very experimental,
           and doesn't give access to any write operations.
 
+if MTD_DOCG3
+config BCH_CONST_M
+        default 14
+config BCH_CONST_T
+        default 4
+endif
+
 config MTD_DOCPROBE
         tristate
         select MTD_DOCECC