diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/serial/8250_pci.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/serial/8250_pci.c')
| -rw-r--r-- | drivers/serial/8250_pci.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index a8bec498cad6..f97224ce59da 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
| @@ -1214,13 +1214,6 @@ static struct pciserial_board pci_boards[] __devinitdata = { | |||
| 1214 | .base_baud = 115200, | 1214 | .base_baud = 115200, |
| 1215 | .uart_offset = 8, | 1215 | .uart_offset = 8, |
| 1216 | }, | 1216 | }, |
| 1217 | [pbn_b0_8_115200] = { | ||
| 1218 | .flags = FL_BASE0, | ||
| 1219 | .num_ports = 8, | ||
| 1220 | .base_baud = 115200, | ||
| 1221 | .uart_offset = 8, | ||
| 1222 | }, | ||
| 1223 | |||
| 1224 | [pbn_b0_1_921600] = { | 1217 | [pbn_b0_1_921600] = { |
| 1225 | .flags = FL_BASE0, | 1218 | .flags = FL_BASE0, |
| 1226 | .num_ports = 1, | 1219 | .num_ports = 1, |