diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /drivers/serial/bcm63xx_uart.c | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'drivers/serial/bcm63xx_uart.c')
| -rw-r--r-- | drivers/serial/bcm63xx_uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c index beddaa6e9069..37ad0c449937 100644 --- a/drivers/serial/bcm63xx_uart.c +++ b/drivers/serial/bcm63xx_uart.c | |||
| @@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_port *port) | |||
| 242 | * higher than fifo size anyway since we're much faster than | 242 | * higher than fifo size anyway since we're much faster than |
| 243 | * serial port */ | 243 | * serial port */ |
| 244 | max_count = 32; | 244 | max_count = 32; |
| 245 | tty = port->info->port.tty; | 245 | tty = port->state->port.tty; |
| 246 | do { | 246 | do { |
| 247 | unsigned int iestat, c, cstat; | 247 | unsigned int iestat, c, cstat; |
| 248 | char flag; | 248 | char flag; |
| @@ -318,7 +318,7 @@ static void bcm_uart_do_tx(struct uart_port *port) | |||
| 318 | return; | 318 | return; |
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | xmit = &port->info->xmit; | 321 | xmit = &port->state->xmit; |
| 322 | if (uart_circ_empty(xmit)) | 322 | if (uart_circ_empty(xmit)) |
| 323 | goto txq_empty; | 323 | goto txq_empty; |
| 324 | 324 | ||