aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/8250_pnp.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-06-29 16:01:54 -0400
committerDave Jones <davej@redhat.com>2006-06-29 16:01:54 -0400
commit55b4d6a52195a8f277ffddf755ddaff359878f41 (patch)
tree06a3183a562f8da4688f65023f7a18dcad702956 /drivers/serial/8250_pnp.c
parentadf8a287150667feb5747f8beade62acacc17d4e (diff)
parent1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff)
Merge ../linus
Conflicts: drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/serial/8250_pnp.c')
-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[] = {
323 { "USR9180", 0 }, 323 { "USR9180", 0 },
324 /* U.S. Robotics 56K Voice INT PnP*/ 324 /* U.S. Robotics 56K Voice INT PnP*/
325 { "USR9190", 0 }, 325 { "USR9190", 0 },
326 /* HP Compaq Tablet PC tc1100 Wacom tablet */ 326 /* Wacom tablets */
327 { "WACF004", 0 },
327 { "WACF005", 0 }, 328 { "WACF005", 0 },
329 { "WACF006", 0 },
328 /* Rockwell's (PORALiNK) 33600 INT PNP */ 330 /* Rockwell's (PORALiNK) 33600 INT PNP */
329 { "WCI0003", 0 }, 331 { "WCI0003", 0 },
330 /* Unkown PnP modems */ 332 /* Unkown PnP modems */