Commit ba262e4a authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -323,8 +323,10 @@ static const struct pnp_device_id pnp_dev_table[] = { ...@@ -323,8 +323,10 @@ static const struct pnp_device_id pnp_dev_table[] = {
{ "USR9180", 0 }, { "USR9180", 0 },
/* U.S. Robotics 56K Voice INT PnP*/ /* U.S. Robotics 56K Voice INT PnP*/
{ "USR9190", 0 }, { "USR9190", 0 },
/* HP Compaq Tablet PC tc1100 Wacom tablet */ /* Wacom tablets */
{ "WACF004", 0 },
{ "WACF005", 0 }, { "WACF005", 0 },
{ "WACF006", 0 },
/* Rockwell's (PORALiNK) 33600 INT PNP */ /* Rockwell's (PORALiNK) 33600 INT PNP */
{ "WCI0003", 0 }, { "WCI0003", 0 },
/* Unkown PnP modems */ /* Unkown PnP modems */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment