diff --git a/[refs] b/[refs] index 049237942e26..df4718b25ea0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4ac42a582e46d7f86f0acb4253a310423c72c4c +refs/heads/master: 384a17b284b9dc92b480cf388310a25e255bac8a diff --git a/trunk/drivers/serial/apbuart.c b/trunk/drivers/serial/apbuart.c index 8a343045131f..c7883a36be9d 100644 --- a/trunk/drivers/serial/apbuart.c +++ b/trunk/drivers/serial/apbuart.c @@ -570,8 +570,8 @@ static int __devinit apbuart_probe(struct of_device *op, apbuart_flush_fifo((struct uart_port *) port); - printk(KERN_INFO "grlib-apbuart at 0x%x, irq %d\n", - port->mapbase, port->irq); + printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n", + (unsigned long long) port->mapbase, port->irq); return 0; }