aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-10-14 00:37:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-14 11:57:30 -0400
commit5dd80d5d096f58b7a83ae493a20bfc9d0de30226 (patch)
tree31f8ecf8d759660d7c11b0d4cea11a9ea4f5164b /drivers/serial
parent80d4b4169e46949e1919d470ebc508cf4fbf0996 (diff)
mpc52xx-uart: fix compile warning (format type mismatch)
Trivial compile warning fix Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/mpc52xx_uart.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 035cca028199..ec36ad78d2fe 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -756,8 +756,8 @@ mpc52xx_console_setup(struct console *co, char *options)
756 if (port->membase == NULL) 756 if (port->membase == NULL)
757 return -EINVAL; 757 return -EINVAL;
758 758
759 pr_debug("mpc52xx-psc uart at %lx, mapped to %p, irq=%x, freq=%i\n", 759 pr_debug("mpc52xx-psc uart at %p, mapped to %p, irq=%x, freq=%i\n",
760 port->mapbase, port->membase, port->irq, port->uartclk); 760 (void*)port->mapbase, port->membase, port->irq, port->uartclk);
761 761
762 /* Setup the port parameters accoding to options */ 762 /* Setup the port parameters accoding to options */
763 if (options) 763 if (options)
@@ -974,8 +974,8 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
974 port->mapbase = res.start; 974 port->mapbase = res.start;
975 port->irq = irq_of_parse_and_map(op->node, 0); 975 port->irq = irq_of_parse_and_map(op->node, 0);
976 976
977 dev_dbg(&op->dev, "mpc52xx-psc uart at %lx, irq=%x, freq=%i\n", 977 dev_dbg(&op->dev, "mpc52xx-psc uart at %p, irq=%x, freq=%i\n",
978 port->mapbase, port->irq, port->uartclk); 978 (void*)port->mapbase, port->irq, port->uartclk);
979 979
980 if ((port->irq==NO_IRQ) || !port->mapbase) { 980 if ((port->irq==NO_IRQ) || !port->mapbase) {
981 printk(KERN_ERR "Could not allocate resources for PSC\n"); 981 printk(KERN_ERR "Could not allocate resources for PSC\n");