diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/serial/8250_pci.c | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/serial/8250_pci.c')
| -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 */ |