summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-11-24 01:53:44 +0100
committerPaul Mackerras <paulus@samba.org>2008-11-24 01:53:44 +0100
commit11bac8a026dd38380b52a914ec9bf65fb2ad13e2 (patch)
tree16ad0b9cb3e74383062ed664733494633bbd43a7 /drivers/serial
parentpowerpc/mpc832x_rdb: fix swapped ethernet ids (diff)
parentpowerpc/virtex: Update defconfigs (diff)
downloadlinux-11bac8a026dd38380b52a914ec9bf65fb2ad13e2.tar.xz
linux-11bac8a026dd38380b52a914ec9bf65fb2ad13e2.zip
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/uartlite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 6a3f8fb0c9dd..3317148a4b93 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -286,8 +286,8 @@ static void ulite_release_port(struct uart_port *port)
static int ulite_request_port(struct uart_port *port)
{
- pr_debug("ulite console: port=%p; port->mapbase=%x\n",
- port, port->mapbase);
+ pr_debug("ulite console: port=%p; port->mapbase=%llx\n",
+ port, (unsigned long long) port->mapbase);
if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) {
dev_err(port->dev, "Memory region busy\n");