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

bf7c7dec · Linus Torvalds · 9e04099c · 04f03bf7 · bf7c7dec
显示空白变更内容
内联并排

Showing with 2 addition and 0 deletion

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

未找到文件。
--- 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[] = {
 	{	"SUP1421",		0	},
 	/* SupraExpress 33.6 Data/Fax PnP modem */
 	{	"SUP1590",		0	},
+	/* SupraExpress 336i Sp ASVD */
+	{	"SUP1620",		0	},
 	/* SupraExpress 33.6 Data/Fax PnP modem */
 	{	"SUP1760",		0	},
 	/* Phoebe Micro */