aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-18 08:40:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-18 08:40:46 -0700
commitace7c769378b9fb2f1fd2c60c04ba3591a6a5af5 (patch)
treefa55844139cf7ba62c1584261306bae1713037cb /drivers
parent1e65174a3378494608e8ed7f8c74d658be9a0fb2 (diff)
parentc1542cbc50d19565006633827532ab9f96c92cea (diff)
downloadkernel_samsung_tuna-ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5.zip
kernel_samsung_tuna-ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5.tar.gz
kernel_samsung_tuna-ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers')
-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 c2786fc..5d8660a 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[] = {
{ "SUP1620", 0 },
/* SupraExpress 33.6 Data/Fax PnP modem */
{ "SUP1760", 0 },
+ /* SupraExpress 56i Sp Intl */
+ { "SUP2171", 0 },
/* Phoebe Micro */
/* Phoebe Micro 33.6 Data Fax 1433VQH Plug & Play */
{ "TEX0011", 0 },