2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 79b13685bdfa..e074943feff5 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;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 1d262c0c613f..283bef0d24cb 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]);