diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-18 11:40:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-18 11:40:46 -0400 |
commit | ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5 (patch) | |
tree | fa55844139cf7ba62c1584261306bae1713037cb | |
parent | 1e65174a3378494608e8ed7f8c74d658be9a0fb2 (diff) | |
parent | c1542cbc50d19565006633827532ab9f96c92cea (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
-rw-r--r-- | drivers/serial/8250_pnp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c index c2786fc41cc5..5d8660a42b77 100644 --- a/drivers/serial/8250_pnp.c +++ b/drivers/serial/8250_pnp.c | |||
@@ -276,6 +276,8 @@ static const struct pnp_device_id pnp_dev_table[] = { | |||
276 | { "SUP1620", 0 }, | 276 | { "SUP1620", 0 }, |
277 | /* SupraExpress 33.6 Data/Fax PnP modem */ | 277 | /* SupraExpress 33.6 Data/Fax PnP modem */ |
278 | { "SUP1760", 0 }, | 278 | { "SUP1760", 0 }, |
279 | /* SupraExpress 56i Sp Intl */ | ||
280 | { "SUP2171", 0 }, | ||
279 | /* Phoebe Micro */ | 281 | /* Phoebe Micro */ |
280 | /* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */ | 282 | /* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */ |
281 | { "TEX0011", 0 }, | 283 | { "TEX0011", 0 }, |