Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

Pull MTD update from David Woodhouse:

 - Lots of cleanups from Artem, including deletion of some obsolete
   drivers

 - Support partitions larger than 4GiB in device tree

 - Support for new SPI chips

* tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd: (83 commits)
  mtd: omap2: Use module_platform_driver()
  mtd: bf5xx_nand: Use module_platform_driver()
  mtd: denali_dt: Remove redundant use of of_match_ptr
  mtd: denali_dt: Change return value to fix smatch warning
  mtd: denali_dt: Use module_platform_driver()
  mtd: denali_dt: Fix incorrect error check
  mtd: nand: subpage write support for hardware based ECC schemes
  mtd: omap2: use msecs_to_jiffies()
  mtd: nand_ids: use size macros
  mtd: nand_ids: improve LEGACY_ID_NAND macro a bit
  mtd: add 4 Toshiba nand chips for the full-id case
  mtd: add the support to parse out the full-id nand type
  mtd: add new fields to nand_flash_dev{}
  mtd: sh_flctl: Use of_match_ptr() macro
  mtd: gpio: Use of_match_ptr() macro
  mtd: gpio: Use devm_kzalloc()
  mtd: davinci_nand: Use of_match_ptr()
  mtd: dataflash: Use of_match_ptr() macro
  mtd: remove h720x flash support
  mtd: onenand: remove OneNAND simulator
  ...

1 files changed, 0 insertions, 30 deletions

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 5d54ad32697f..a60f6c17f57b 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -41,14 +41,6 @@ config MTD_SM_COMMON
         tristate
         default n
 
-config MTD_NAND_MUSEUM_IDS
-        bool "Enable chip ids for obsolete ancient NAND devices"
-        default n
-        help
-          Enable this option only when your board has first generation
-          NAND chips (page size 256 byte, erase size 4-8KiB). The IDs
-          of these chips were reused by later, larger chips.
-
 config MTD_NAND_DENALI
         tristate "Support Denali NAND controller"
         help
@@ -81,12 +73,6 @@ config MTD_NAND_DENALI_SCRATCH_REG_ADDR
           scratch register here to enable this feature. On Intel Moorestown
           boards, the scratch register is at 0xFF108018.
 
-config MTD_NAND_H1900
-        tristate "iPAQ H1900 flash"
-        depends on ARCH_PXA && BROKEN
-        help
-          This enables the driver for the iPAQ h1900 flash.
-
 config MTD_NAND_GPIO
         tristate "GPIO NAND Flash driver"
         depends on GPIOLIB && ARM
@@ -201,22 +187,6 @@ config MTD_NAND_BF5XX_BOOTROM_ECC
 
           If unsure, say N.
 
-config MTD_NAND_RTC_FROM4
-        tristate "Renesas Flash ROM 4-slot interface board (FROM_BOARD4)"
-        depends on SH_SOLUTION_ENGINE
-        select REED_SOLOMON
-        select REED_SOLOMON_DEC8
-        select BITREVERSE
-        help
-          This enables the driver for the Renesas Technology AG-AND
-          flash interface board (FROM_BOARD4)
-
-config MTD_NAND_PPCHAMELEONEVB
-        tristate "NAND Flash device on PPChameleonEVB board"
-        depends on PPCHAMELEONEVB && BROKEN
-        help
-          This enables the NAND flash driver on the PPChameleon EVB Board.
-
 config MTD_NAND_S3C2410
         tristate "NAND Flash support for Samsung S3C SoCs"
         depends on ARCH_S3C24XX || ARCH_S3C64XX