Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf7c7dec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 9e04099c 04f03bf7

drivers/serial/8250_pnp.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */