Commit ace7c769 authored by Linus Torvalds's avatar Linus Torvalds

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

parents 1e65174a c1542cbc
...@@ -276,6 +276,8 @@ static const struct pnp_device_id pnp_dev_table[] = { ...@@ -276,6 +276,8 @@ static const struct pnp_device_id pnp_dev_table[] = {
{ "SUP1620", 0 }, { "SUP1620", 0 },
/* SupraExpress 33.6 Data/Fax PnP modem */ /* SupraExpress 33.6 Data/Fax PnP modem */
{ "SUP1760", 0 }, { "SUP1760", 0 },
/* SupraExpress 56i Sp Intl */
{ "SUP2171", 0 },
/* Phoebe Micro */ /* Phoebe Micro */
/* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */ /* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */
{ "TEX0011", 0 }, { "TEX0011", 0 },
......
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