summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 15:00:33 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 15:00:33 -0700
commitba262e4a4d4c23b5e6c15dbb3a99696b562e8035 (patch)
tree4deb000854a1b3509f703c393ebd2ec1ad0887c0 /drivers
parenta09ab7e2fcd22f0490a270bb310536c651d53cb9 (diff)
parentb07076e6173a2593e369c3375f07c1cd7d78c36f (diff)
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/8250_pnp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index b79ed0665d51..739bc84f91e9 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -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 */