Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix shared mmap when more than two maps of the same file exist
  [ARM] fix VIPT/VIVT macro optimisations, add comments
  [ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
  [ARM] update defconfig for eseries.
  [ARM] PXA: squash warning in pxafb
  [ARM] pxa: PXA25x UDC - Fix warning during build
  [ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26
  [ARM] fix IOP32x, IOP33x, MXC and Samsung builds
  [ARM] pci: provide dummy pci_get_legacy_ide_irq()
  [ARM] fix fls() for 64-bit arguments
  [ARM] fix mode for board-yl-9200.c
  [ARM] 5176/1: arm/Makefile: fix: ARM946T -> ARM946E

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index f9f72a211292..006be92ee3f3 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -125,15 +125,15 @@ static ssize_t flash_read(struct file *file, char __user *buf, size_t size,
         ssize_t ret;
 
         if (flashdebug)
-                printk(KERN_DEBUG "flash_read: flash_read: offset=0x%lX, "
-                       "buffer=%p, count=0x%X.\n", p, buf, count);
+                printk(KERN_DEBUG "flash_read: flash_read: offset=0x%llx, "
+                       "buffer=%p, count=0x%zx.\n", *ppos, buf, size);
         /*
          * We now lock against reads and writes. --rmk
          */
         if (mutex_lock_interruptible(&nwflash_mutex))
                 return -ERESTARTSYS;
 
-        ret = simple_read_from_buffer(buf, size, ppos, FLASH_BASE, gbFlashSize);
+        ret = simple_read_from_buffer(buf, size, ppos, (void *)FLASH_BASE, gbFlashSize);
         mutex_unlock(&nwflash_mutex);
 
         return ret;