summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2009-12-09 12:31:37 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-20 15:03:27 -0800
commit6d34855d9aa281f72c533ecb827405139d1b0fe9 (patch)
treeb3b9d2084b67505f12055de841a8d9bd847cec24
parenteeec32a731631a9bad9abb21c626b9f2840bee0d (diff)
downloadlinux-3.10-6d34855d9aa281f72c533ecb827405139d1b0fe9.tar.gz
linux-3.10-6d34855d9aa281f72c533ecb827405139d1b0fe9.tar.bz2
linux-3.10-6d34855d9aa281f72c533ecb827405139d1b0fe9.zip
serial: 8250_pnp: use wildcard for serial Wacom tablets
Wacom claims that the WACF namespace will always be devoted to serial Wacom tablets. Remove the existing entries and add a wildcard to avoid having to update the kernel every time they add a new device. Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> Tested-by: Ping Cheng <pingc@wacom.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/serial/8250_pnp.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index b5496a19d96..24485cc62ff 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -328,15 +328,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
/* U.S. Robotics 56K Voice INT PnP*/
{ "USR9190", 0 },
/* Wacom tablets */
- { "WACF004", 0 },
- { "WACF005", 0 },
- { "WACF006", 0 },
- { "WACF007", 0 },
- { "WACF008", 0 },
- { "WACF009", 0 },
- { "WACF00A", 0 },
- { "WACF00B", 0 },
- { "WACF00C", 0 },
+ { "WACFXXX", 0 },
/* Compaq touchscreen */
{ "FPI2002", 0 },
/* Fujitsu Stylistic touchscreens */