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

* git://git.infradead.org/mtd-2.6: (82 commits)
  mtd: fix build error in m25p80.c
  mtd: Remove redundant mutex from mtd_blkdevs.c
  MTD: Fix wrong check register_blkdev return value
  Revert "mtd: cleanup Kconfig dependencies"
  mtd: cfi_cmdset_0002: make sector erase command variable
  mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
  mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
  mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
  block2mtd: dubious assignment
  P4080/mtd: Fix the freescale lbc issue with 36bit mode
  P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
  mtd: phram: use KBUILD_MODNAME
  mtd: OneNAND: S5PC110: Fix double call suspend & resume function
  mtd: nand: fix MTD_MODE_RAW writes
  jffs2: use kmemdup
  mtd: sm_ftl: cosmetic, use bool when possible
  mtd: r852: remove useless pci powerup/down from suspend/resume routines
  mtd: blktrans: fix a race vs kthread_stop
  mtd: blktrans: kill BKL
  mtd: allow to unload the mtdtrans module if its block devices aren't open
  ...

Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 32e89d773b4e..af5707a80205 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -208,10 +208,14 @@ static int __devinit gpio_flash_probe(struct platform_device *pdev)
         if (!state)
                 return -ENOMEM;
 
+        /*
+         * We cast start/end to known types in the boards file, so cast
+         * away their pointer types here to the known types (gpios->xxx).
+         */
         state->gpio_count     = gpios->end;
-        state->gpio_addrs     = (void *)gpios->start;
+        state->gpio_addrs     = (void *)(unsigned long)gpios->start;
         state->gpio_values    = (void *)(state + 1);
-        state->win_size       = memory->end - memory->start + 1;
+        state->win_size       = resource_size(memory);
         memset(state->gpio_values, 0xff, arr_size);
 
         state->map.name       = DRIVER_NAME;
@@ -221,7 +225,7 @@ static int __devinit gpio_flash_probe(struct platform_device *pdev)
         state->map.copy_to    = gf_copy_to;
         state->map.bankwidth  = pdata->width;
         state->map.size       = state->win_size * (1 << state->gpio_count);
-        state->map.virt       = (void __iomem *)memory->start;
+        state->map.virt       = ioremap_nocache(memory->start, state->map.size);
         state->map.phys       = NO_XIP;
         state->map.map_priv_1 = (unsigned long)state;