diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 09:19:00 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 09:19:00 -0400 |
| commit | 9063974cdbc5463528cb6aa60c91bc0267af7bbb (patch) | |
| tree | 1dffc62d8b79b3d89459cf23aa59c553e186840a /drivers/serial/serial_lh7a40x.c | |
| parent | d6d6a86e14a6b5a26c785b45268874a8f7a52b4d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/serial_lh7a40x.c')
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index eb18d429752d..cb49a5ac022f 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
| @@ -137,7 +137,7 @@ static void lh7a40xuart_enable_ms (struct uart_port* port) | |||
| 137 | 137 | ||
| 138 | static void lh7a40xuart_rx_chars (struct uart_port* port) | 138 | static void lh7a40xuart_rx_chars (struct uart_port* port) |
| 139 | { | 139 | { |
| 140 | struct tty_struct* tty = port->info->tty; | 140 | struct tty_struct* tty = port->info->port.tty; |
| 141 | int cbRxMax = 256; /* (Gross) limit on receive */ | 141 | int cbRxMax = 256; /* (Gross) limit on receive */ |
| 142 | unsigned int data; /* Received data and status */ | 142 | unsigned int data; /* Received data and status */ |
| 143 | unsigned int flag; | 143 | unsigned int flag; |