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

ace7c769 · Linus Torvalds · 1e65174a · c1542cbc · ace7c769
Commit ace7c769 authored Oct 18, 2005 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/serial/8250_pnp.c drivers/serial/8250_pnp.c +2 -0

No files found.
--- 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	},