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

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

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

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] 8250_pnp: add support for other Wacom tablets
parents a09ab7e2 b07076e6

drivers/serial/8250_pnp.c

+3 −1
Original line number Diff line number Diff line
@@ -323,8 +323,10 @@ static const struct pnp_device_id pnp_dev_table[] = { 
	{	"USR9180",		0	},

	/* U.S. Robotics 56K Voice INT PnP*/

	{	"USR9190",		0	},

	/* HP Compaq Tablet PC tc1100 Wacom tablet */

	/* Wacom tablets */

	{	"WACF004",		0	},

	{	"WACF005",		0	},

	{       "WACF006",              0       },

	/* Rockwell's (PORALiNK) 33600 INT PNP */

	{	"WCI0003",		0	},

	/* Unkown PnP modems */