Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (59 commits)
  mtd: mtdpart: disallow reading OOB past the end of the partition
  mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
  UBI: use mtd->writebufsize to set minimal I/O unit size
  mtd: initialize writebufsize in the MTD object of a partition
  mtd: onenand: add mtd->writebufsize initialization
  mtd: nand: add mtd->writebufsize initialization
  mtd: cfi: add writebufsize initialization
  mtd: add writebufsize field to mtd_info struct
  mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
  mtd: OneNAND: add enable / disable methods to onenand_chip
  mtd: m25p80: Fix JEDEC ID for AT26DF321
  mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
  mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
  mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
  mtd: nand: ams-delta: drop omap_read/write, use ioremap
  mtd: m25p80: add debugging trace in sst_write
  mtd: nand: ams-delta: select for built-in by default
  mtd: OneNAND: lighten scary initial bad block messages
  mtd: OneNAND: OMAP2/3: add support for command line partitioning
  mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
  ...

Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.

8 files changed, 19 insertions, 29 deletions

diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 19fe92db0c46..77d64ce19e9f 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -149,11 +149,8 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
                 printk(KERN_ERR MOD_NAME
-                        " %s(): Unable to register resource"
-                        " 0x%.16llx-0x%.16llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                       " %s(): Unable to register resource %pR - kernel bug?\n",
+                       __func__, &window->rsrc);
         }
 
 
diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
index d175c120ee84..1f3049590d9e 100644
--- a/drivers/mtd/maps/bcm963xx-flash.c
+++ b/drivers/mtd/maps/bcm963xx-flash.c
@@ -196,10 +196,15 @@ static int bcm963xx_probe(struct platform_device *pdev)
         bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);
         if (!bcm963xx_mtd_info) {
                 dev_err(&pdev->dev, "failed to probe using CFI\n");
+                bcm963xx_mtd_info = do_map_probe("jedec_probe", &bcm963xx_map);
+                if (bcm963xx_mtd_info)
+                        goto probe_ok;
+                dev_err(&pdev->dev, "failed to probe using JEDEC\n");
                 err = -EIO;
                 goto err_probe;
         }
 
+probe_ok:
         bcm963xx_mtd_info->owner = THIS_MODULE;
 
         /* This is mutually exclusive */
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index ddb462bea9b5..5fdb7b26cea3 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -178,11 +178,8 @@ static int __devinit ck804xrom_init_one (struct pci_dev *pdev,
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
                 printk(KERN_ERR MOD_NAME
-                        " %s(): Unable to register resource"
-                        " 0x%.016llx-0x%.016llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                       " %s(): Unable to register resource %pR - kernel bug?\n",
+                        __func__, &window->rsrc);
         }
 
 
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index d12c93dc1aad..4feb7507ab7c 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -242,12 +242,9 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
         window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
-                printk(KERN_DEBUG MOD_NAME
-                        ": %s(): Unable to register resource"
-                        " 0x%.08llx-0x%.08llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                printk(KERN_DEBUG MOD_NAME ": "
+                       "%s(): Unable to register resource %pR - kernel bug?\n",
+                        __func__, &window->rsrc);
         }
 
         /* Map the firmware hub into my address space. */
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index f102bf243a74..1337a4191a0c 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -175,12 +175,9 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
         window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
         if (request_resource(&iomem_resource, &window->rsrc)) {
                 window->rsrc.parent = NULL;
-                printk(KERN_DEBUG MOD_NAME
-                        ": %s(): Unable to register resource"
-                        " 0x%.16llx-0x%.16llx - kernel bug?\n",
-                        __func__,
-                        (unsigned long long)window->rsrc.start,
-                        (unsigned long long)window->rsrc.end);
+                printk(KERN_DEBUG MOD_NAME ": "
+                       "%s(): Unable to register resource %pR - kernel bug?\n",
+                       __func__, &window->rsrc);
         }
 
         /* Map the firmware hub into my address space. */
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 9861814aa027..8506578e6a35 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -274,9 +274,7 @@ static int __devinit of_flash_probe(struct platform_device *dev,
                         continue;
                 }
 
-                dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
-                        (unsigned long long)res.start,
-                        (unsigned long long)res.end);
+                dev_dbg(&dev->dev, "of_flash device: %pR\n", &res);
 
                 err = -EBUSY;
                 res_size = resource_size(&res);
diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c
index b5391ebb736e..027e628a4f1d 100644
--- a/drivers/mtd/maps/scx200_docflash.c
+++ b/drivers/mtd/maps/scx200_docflash.c
@@ -166,9 +166,8 @@ static int __init init_scx200_docflash(void)
                 outl(pmr, scx200_cb_base + SCx200_PMR);
         }
 
-        printk(KERN_INFO NAME ": DOCCS mapped at 0x%llx-0x%llx, width %d\n",
-                        (unsigned long long)docmem.start,
-                        (unsigned long long)docmem.end, width);
+        printk(KERN_INFO NAME ": DOCCS mapped at %pR, width %d\n",
+               &docmem, width);
 
         scx200_docflash_map.size = size;
         if (width == 8)
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 60146984f4be..c08e140d40ed 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -139,7 +139,7 @@ static int __init init_tqm_mtd(void)
                         goto error_mem;
                 }
 
-                map_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);
+                map_banks[idx]->name = kmalloc(16, GFP_KERNEL);
 
                 if (!map_banks[idx]->name) {
                         ret = -ENOMEM;