Skip to content

L
linux-davinci
Commit 1ff9ba7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents 66e05225 c2cd6d3c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/serial/8250_pci.c
View file @ 1ff9ba7a
...@@ -516,7 +516,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board, ...@@ -516,7 +516,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board,
break; break;
case 3: case 3:
offset = board->uart_offset; offset = board->uart_offset;
bar = 1; /* FALLTHROUGH */
case 4: /* BAR 2 */ case 4: /* BAR 2 */
case 5: /* BAR 3 */ case 5: /* BAR 3 */
case 6: /* BAR 4 */ case 6: /* BAR 4 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment