diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:15:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:15:46 -0400 |
| commit | a637b0d45947df686979b85361ad5bfa9d19fdd3 (patch) | |
| tree | 926207cdfbbde430d1e7b515f32fe1c740b15745 /arch/cris | |
| parent | f78089e87e576f91396a5d428d14b552178dfb17 (diff) | |
| parent | cdb6404cc53a166a1e3b0179bd8d1f4070beff41 (diff) | |
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
...
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/Kconfig | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 06dd026533e3..8769a9045a54 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -264,7 +264,6 @@ config ETRAX_AXISFLASHMAP | |||
| 264 | select MTD_CFI | 264 | select MTD_CFI |
| 265 | select MTD_CFI_AMDSTD | 265 | select MTD_CFI_AMDSTD |
| 266 | select MTD_JEDECPROBE if ETRAX_ARCH_V32 | 266 | select MTD_JEDECPROBE if ETRAX_ARCH_V32 |
| 267 | select MTD_CHAR | ||
| 268 | select MTD_BLOCK | 267 | select MTD_BLOCK |
| 269 | select MTD_COMPLEX_MAPPINGS | 268 | select MTD_COMPLEX_MAPPINGS |
| 270 | help | 269 | help |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index af4a486dadcd..c55971a40c34 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
| @@ -404,7 +404,6 @@ config ETRAX_AXISFLASHMAP | |||
| 404 | select MTD_CFI | 404 | select MTD_CFI |
| 405 | select MTD_CFI_AMDSTD | 405 | select MTD_CFI_AMDSTD |
| 406 | select MTD_JEDECPROBE | 406 | select MTD_JEDECPROBE |
| 407 | select MTD_CHAR | ||
| 408 | select MTD_BLOCK | 407 | select MTD_BLOCK |
| 409 | select MTD_COMPLEX_MAPPINGS | 408 | select MTD_COMPLEX_MAPPINGS |
| 410 | help | 409 | help |