diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-23 19:53:44 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-23 19:53:44 -0500 |
| commit | 11bac8a026dd38380b52a914ec9bf65fb2ad13e2 (patch) | |
| tree | 16ad0b9cb3e74383062ed664733494633bbd43a7 /drivers/serial/uartlite.c | |
| parent | e871809cccc11aaa072afaf746f8fd946d2d9cac (diff) | |
| parent | c8d698849e135780738c2cb08f07f06eda982a8c (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
Diffstat (limited to 'drivers/serial/uartlite.c')
| -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) | |||
| 286 | 286 | ||
| 287 | static int ulite_request_port(struct uart_port *port) | 287 | static int ulite_request_port(struct uart_port *port) |
| 288 | { | 288 | { |
| 289 | pr_debug("ulite console: port=%p; port->mapbase=%x\n", | 289 | pr_debug("ulite console: port=%p; port->mapbase=%llx\n", |
| 290 | port, port->mapbase); | 290 | port, (unsigned long long) port->mapbase); |
| 291 | 291 | ||
| 292 | if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) { | 292 | if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) { |
| 293 | dev_err(port->dev, "Memory region busy\n"); | 293 | dev_err(port->dev, "Memory region busy\n"); |