diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /arch/mn10300/kernel/mn10300-serial.c | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'arch/mn10300/kernel/mn10300-serial.c')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index b9c268c6b2fb..8b054e7a8ae8 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
| @@ -392,7 +392,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask) | |||
| 392 | static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) | 392 | static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) |
| 393 | { | 393 | { |
| 394 | struct uart_icount *icount = &port->uart.icount; | 394 | struct uart_icount *icount = &port->uart.icount; |
| 395 | struct tty_struct *tty = port->uart.info->tty; | 395 | struct tty_struct *tty = port->uart.info->port.tty; |
| 396 | unsigned ix; | 396 | unsigned ix; |
| 397 | int count; | 397 | int count; |
| 398 | u8 st, ch, push, status, overrun; | 398 | u8 st, ch, push, status, overrun; |