diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
| commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
| tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /drivers/serial | |
| parent | cea555d384b85271035814c5adad23e6c7fc5d2a (diff) | |
| parent | 2434bbb30e79468c49cff3cff6005236f55ed188 (diff) | |
Merge branch '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) | |||
| 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"); |