diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 23:06:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 23:06:53 -0400 |
| commit | 29a6ccca3869bbe33879dae0cd7df2a1559eff54 (patch) | |
| tree | 2d9d355d8662ede95af7bc812d686dc4d5f37ff3 /arch/cris/Kconfig | |
| parent | 426048313dfa7d65dbd2379b1665755511f9544f (diff) | |
| parent | 6a8a98b22b10f1560d5f90aded4a54234b9b2724 (diff) | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (97 commits)
mtd: kill CONFIG_MTD_PARTITIONS
mtd: remove add_mtd_partitions, add_mtd_device and friends
mtd: convert remaining users to mtd_device_register()
mtd: samsung onenand: convert to mtd_device_register()
mtd: omap2 onenand: convert to mtd_device_register()
mtd: txx9ndfmc: convert to mtd_device_register()
mtd: tmio_nand: convert to mtd_device_register()
mtd: socrates_nand: convert to mtd_device_register()
mtd: sharpsl: convert to mtd_device_register()
mtd: s3c2410 nand: convert to mtd_device_register()
mtd: ppchameleonevb: convert to mtd_device_register()
mtd: orion_nand: convert to mtd_device_register()
mtd: omap2: convert to mtd_device_register()
mtd: nomadik_nand: convert to mtd_device_register()
mtd: ndfc: convert to mtd_device_register()
mtd: mxc_nand: convert to mtd_device_register()
mtd: mpc5121_nfc: convert to mtd_device_register()
mtd: jz4740_nand: convert to mtd_device_register()
mtd: h1910: convert to mtd_device_register()
mtd: fsmc_nand: convert to mtd_device_register()
...
Fixed up trivial conflicts in
- drivers/mtd/maps/integrator-flash.c: removed in ARM tree
- drivers/mtd/maps/physmap.c: addition of afs partition probe type
clashing with removal of CONFIG_MTD_PARTITIONS
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index b6b94a27d276..17addacb169e 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -270,7 +270,6 @@ config ETRAX_AXISFLASHMAP | |||
| 270 | select MTD_JEDECPROBE if ETRAX_ARCH_V32 | 270 | select MTD_JEDECPROBE if ETRAX_ARCH_V32 |
| 271 | select MTD_CHAR | 271 | select MTD_CHAR |
| 272 | select MTD_BLOCK | 272 | select MTD_BLOCK |
| 273 | select MTD_PARTITIONS | ||
| 274 | select MTD_COMPLEX_MAPPINGS | 273 | select MTD_COMPLEX_MAPPINGS |
| 275 | help | 274 | help |
| 276 | This option enables MTD mapping of flash devices. Needed to use | 275 | This option enables MTD mapping of flash devices. Needed to use |