diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-24 11:53:44 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-24 11:53:44 +1100 |
| commit | 11bac8a026dd38380b52a914ec9bf65fb2ad13e2 (patch) | |
| tree | 16ad0b9cb3e74383062ed664733494633bbd43a7 /drivers/serial | |
| parent | e871809cccc11aaa072afaf746f8fd946d2d9cac (diff) | |
| parent | c8d698849e135780738c2cb08f07f06eda982a8c (diff) | |
| download | talos-obmc-linux-11bac8a026dd38380b52a914ec9bf65fb2ad13e2.tar.gz talos-obmc-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.c | 4 |
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"); |
