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, 3 insertions, 2 deletions

diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 79b13685bdf..e074943feff 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1198,10 +1198,11 @@ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up)
         if (up->port.type == PORT_UNKNOWN)
                 return -ENODEV;
 
-        printk("%s: %s port at %lx, irq %u\n",
+        printk("%s: %s port at %llx, irq %u\n",
                to_of_device(up->port.dev)->node->full_name,
                (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
-               up->port.mapbase, up->port.irq);
+               (unsigned long long) up->port.mapbase,
+               up->port.irq);
 
 #ifdef CONFIG_SERIO
         serio = &up->serio;