From 9593d5077796a342e3d74e74ccf1d8beb96e08a6 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Sat, 13 Oct 2007 22:37:02 -0600 Subject: [PATCH] --- yaml --- r: 68614 b: refs/heads/master c: 5dd80d5d096f58b7a83ae493a20bfc9d0de30226 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/mpc52xx_uart.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7163a6afef9a..a785e0801e32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80d4b4169e46949e1919d470ebc508cf4fbf0996 +refs/heads/master: 5dd80d5d096f58b7a83ae493a20bfc9d0de30226 diff --git a/trunk/drivers/serial/mpc52xx_uart.c b/trunk/drivers/serial/mpc52xx_uart.c index 035cca028199..ec36ad78d2fe 100644 --- a/trunk/drivers/serial/mpc52xx_uart.c +++ b/trunk/drivers/serial/mpc52xx_uart.c @@ -756,8 +756,8 @@ mpc52xx_console_setup(struct console *co, char *options) if (port->membase == NULL) return -EINVAL; - pr_debug("mpc52xx-psc uart at %lx, mapped to %p, irq=%x, freq=%i\n", - port->mapbase, port->membase, port->irq, port->uartclk); + pr_debug("mpc52xx-psc uart at %p, mapped to %p, irq=%x, freq=%i\n", + (void*)port->mapbase, port->membase, port->irq, port->uartclk); /* Setup the port parameters accoding to options */ if (options) @@ -974,8 +974,8 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match) port->mapbase = res.start; port->irq = irq_of_parse_and_map(op->node, 0); - dev_dbg(&op->dev, "mpc52xx-psc uart at %lx, irq=%x, freq=%i\n", - port->mapbase, port->irq, port->uartclk); + dev_dbg(&op->dev, "mpc52xx-psc uart at %p, irq=%x, freq=%i\n", + (void*)port->mapbase, port->irq, port->uartclk); if ((port->irq==NO_IRQ) || !port->mapbase) { printk(KERN_ERR "Could not allocate resources for PSC\n");