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

4 files changed, 10 insertions, 9 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
         select MTD_JEDECPROBE if ETRAX_ARCH_V32
         select MTD_CHAR
         select MTD_BLOCK
-        select MTD_PARTITIONS
         select MTD_COMPLEX_MAPPINGS
         help
           This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index ed708e19d09e..a4bbdfd37bd8 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -372,7 +372,7 @@ static int __init init_axis_flash(void)
 #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
         if (mymtd) {
                 main_partition.size = mymtd->size;
-                err = add_mtd_partitions(mymtd, &main_partition, 1);
+                err = mtd_device_register(mymtd, &main_partition, 1);
                 if (err)
                         panic("axisflashmap: Could not initialize "
                               "partition for whole main mtd device!\n");
@@ -382,10 +382,12 @@ static int __init init_axis_flash(void)
         if (mymtd) {
                 if (use_default_ptable) {
                         printk(KERN_INFO " Using default partition table.\n");
-                        err = add_mtd_partitions(mymtd, axis_default_partitions,
-                                                 NUM_DEFAULT_PARTITIONS);
+                        err = mtd_device_register(mymtd,
+                                                  axis_default_partitions,
+                                                  NUM_DEFAULT_PARTITIONS);
                 } else {
-                        err = add_mtd_partitions(mymtd, axis_partitions, pidx);
+                        err = mtd_device_register(mymtd, axis_partitions,
+                                                  pidx);
                 }
 
                 if (err)
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 1633b120aa81..41a2732e8b9c 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -405,7 +405,6 @@ config ETRAX_AXISFLASHMAP
         select MTD_JEDECPROBE
         select MTD_CHAR
         select MTD_BLOCK
-        select MTD_PARTITIONS
         select MTD_COMPLEX_MAPPINGS
         help
           This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 7b155f8203b8..a2bde3744622 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -561,7 +561,7 @@ static int __init init_axis_flash(void)
 #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
         if (main_mtd) {
                 main_partition.size = main_mtd->size;
-                err = add_mtd_partitions(main_mtd, &main_partition, 1);
+                err = mtd_device_register(main_mtd, &main_partition, 1);
                 if (err)
                         panic("axisflashmap: Could not initialize "
                               "partition for whole main mtd device!\n");
@@ -597,7 +597,8 @@ static int __init init_axis_flash(void)
                         mtd_ram->erasesize = (main_mtd ? main_mtd->erasesize :
                                 CONFIG_ETRAX_PTABLE_SECTOR);
                 } else {
-                        err = add_mtd_partitions(main_mtd, &partition[part], 1);
+                        err = mtd_device_register(main_mtd, &partition[part],
+                                                  1);
                         if (err)
                                 panic("axisflashmap: Could not add mtd "
                                         "partition %d\n", part);
@@ -633,7 +634,7 @@ static int __init init_axis_flash(void)
 #ifndef CONFIG_ETRAX_VCS_SIM
         if (aux_mtd) {
                 aux_partition.size = aux_mtd->size;
-                err = add_mtd_partitions(aux_mtd, &aux_partition, 1);
+                err = mtd_device_register(aux_mtd, &aux_partition, 1);
                 if (err)
                         panic("axisflashmap: Could not initialize "
                               "aux mtd device!\n");