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

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 */