Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Make flush_tlb_kernel_range() an inline function.
  [SERIAL]: Fix 32-bit warnings in sunzilog.c and sunsu.c
  [SPARC32]: Kill unused vars and macros from prom/console.c
  [SPARC32]: Add __cmpdi2() libcall implementation ala. MIPS.
  [VIDEO]: Do not prom_halt() in cg3 and bw2 device probe.
  [SUNVDC]: Use slice 0xff on VD_DISK_TYPE_DISK.

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 1d262c0c613..283bef0d24c 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1431,14 +1431,16 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                         return err;
                 }
         } else {
-                printk(KERN_INFO "%s: Keyboard at MMIO 0x%lx (irq = %d) "
+                printk(KERN_INFO "%s: Keyboard at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id, up[0].port.mapbase, op->irqs[0],
-                       sunzilog_type (&up[0].port));
-                printk(KERN_INFO "%s: Mouse at MMIO 0x%lx (irq = %d) "
+                       op->dev.bus_id,
+                       (unsigned long long) up[0].port.mapbase,
+                       op->irqs[0], sunzilog_type(&up[0].port));
+                printk(KERN_INFO "%s: Mouse at MMIO 0x%llx (irq = %d) "
                        "is a %s\n",
-                       op->dev.bus_id, up[1].port.mapbase, op->irqs[0],
-                       sunzilog_type (&up[1].port));
+                       op->dev.bus_id,
+                       (unsigned long long) up[1].port.mapbase,
+                       op->irqs[0], sunzilog_type(&up[1].port));
         }
 
         dev_set_drvdata(&op->dev, &up[0]);