From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2011 03:06:53 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: MMI-PSA29.97-13-9~19346
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=29a6ccca3869bbe33879dae0cd7df2a1559eff54;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

29a6ccca3869bbe33879dae0cd7df2a1559eff54
diff --cc drivers/mtd/maps/Kconfig
index 5069111c81cc,195b9ef3b7ee..c0c328c5b133
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@@ -260,16 -257,9 +257,16 @@@ config MTD_BCM963X
  	  Support for parsing CFE image tag and creating MTD partitions on
  	  Broadcom BCM63xx boards.
  
 +config MTD_LANTIQ
 +	tristate "Lantiq SoC NOR support"
 +	depends on LANTIQ
 +	select MTD_PARTITIONS
 +	help
 +	  Support for NOR flash attached to the Lantiq SoC's External Bus Unit.
 +
  config MTD_DILNETPC
  	tristate "CFI Flash device mapped on DIL/Net PC"
- 	depends on X86 && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
+ 	depends on X86 && MTD_CFI_INTELEXT && BROKEN
  	help
  	  MTD map driver for SSV DIL/Net PC Boards "DNP" and "ADNP".
  	  For details, see <http://www.ssv-embedded.de/ssv/pc104/p169.htm>
diff --cc drivers/mtd/maps/physmap.c
index 1a9b94f0ee54,d2059261ca8b..f64cee4a3bfb
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@@ -92,10 -65,7 +81,8 @@@ static const char *rom_probe_types[] = 
  					"qinfo_probe",
  					"map_rom",
  					NULL };
- #ifdef CONFIG_MTD_PARTITIONS
 -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
 +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs",
 +					  NULL };
- #endif
  
  static int physmap_flash_probe(struct platform_device *dev)
  {