aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-14 20:16:55 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-14 20:16:55 -0400
commitbf7c7decb9752a3cb644b435cb354c8948606680 (patch)
tree457d3d4749be66d05f18857dbf57a84b532f2e3a /drivers/serial
parent9e04099cb90dce6a34b4cbc6b4a0d4e4cc4c5680 (diff)
parent04f03bf7dbd04c15c30d91c6a277f6970cc4ef14 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/8250_pnp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 6b321e82cafb..c2786fc41cc5 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -272,6 +272,8 @@ static const struct pnp_device_id pnp_dev_table[] = {
272 { "SUP1421", 0 }, 272 { "SUP1421", 0 },
273 /* SupraExpress 33.6 Data/Fax PnP modem */ 273 /* SupraExpress 33.6 Data/Fax PnP modem */
274 { "SUP1590", 0 }, 274 { "SUP1590", 0 },
275 /* SupraExpress 336i Sp ASVD */
276 { "SUP1620", 0 },
275 /* SupraExpress 33.6 Data/Fax PnP modem */ 277 /* SupraExpress 33.6 Data/Fax PnP modem */
276 { "SUP1760", 0 }, 278 { "SUP1760", 0 },
277 /* Phoebe Micro */ 279 /* Phoebe Micro */