diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:24:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 18:24:36 -0500 |
| commit | 1ff9ba7af6033475998be61c7d1dc0e0c8c11181 (patch) | |
| tree | c1a938d3cd7964cb7c7239675a49347f9174ca4d | |
| parent | 66e05225262cd9271fac13fe2fd1e9edb65e3978 (diff) | |
| parent | c2cd6d3c122798c39f63e21e4dd04ee5790010b6 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/8250_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 8d92adfbb8bd..8adca0ce267f 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
| @@ -516,7 +516,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board, | |||
| 516 | break; | 516 | break; |
| 517 | case 3: | 517 | case 3: |
| 518 | offset = board->uart_offset; | 518 | offset = board->uart_offset; |
| 519 | bar = 1; | 519 | /* FALLTHROUGH */ |
| 520 | case 4: /* BAR 2 */ | 520 | case 4: /* BAR 2 */ |
| 521 | case 5: /* BAR 3 */ | 521 | case 5: /* BAR 3 */ |
| 522 | case 6: /* BAR 4 */ | 522 | case 6: /* BAR 4 */ |