aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorMatthew Garrett <mjg59@srcf.ucam.org>2009-04-06 12:32:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-06 17:36:26 -0400
commit97ea33f9e375e4f9b3049ca861e5c91cc626c55f (patch)
tree80d9db3fdc71aaf7ff4aa6d3ac7dfb278d1ec45f /drivers/serial
parent3eba1da43e043cd760c98cd227546d310e145843 (diff)
serial: Update PNP IDs
Add new Wacom device IDs to the 8250_pnp serial driver, to support autoconfig on some newer tablet PCs. Also add a comment to clarify that the FUJ02E6 device is a custom protocol, not a Wacom tablet. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Alan Cox <alan@etchedpixels.co.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/8250_pnp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 6db9f13b6225..d71dfe398940 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -334,6 +334,9 @@ static const struct pnp_device_id pnp_dev_table[] = {
334 { "WACF007", 0 }, 334 { "WACF007", 0 },
335 { "WACF008", 0 }, 335 { "WACF008", 0 },
336 { "WACF009", 0 }, 336 { "WACF009", 0 },
337 { "WACF00A", 0 },
338 { "WACF00B", 0 },
339 { "WACF00C", 0 },
337 /* Compaq touchscreen */ 340 /* Compaq touchscreen */
338 { "FPI2002", 0 }, 341 { "FPI2002", 0 },
339 /* Fujitsu Stylistic touchscreens */ 342 /* Fujitsu Stylistic touchscreens */
@@ -347,8 +350,9 @@ static const struct pnp_device_id pnp_dev_table[] = {
347 { "FUJ02B8", 0 }, 350 { "FUJ02B8", 0 },
348 { "FUJ02B9", 0 }, 351 { "FUJ02B9", 0 },
349 { "FUJ02BC", 0 }, 352 { "FUJ02BC", 0 },
350 /* Fujitsu Wacom Tablet PC devices */ 353 /* Fujitsu Wacom Tablet PC device */
351 { "FUJ02E5", 0 }, 354 { "FUJ02E5", 0 },
355 /* Fujitsu P-series tablet PC device */
352 { "FUJ02E6", 0 }, 356 { "FUJ02E6", 0 },
353 /* 357 /*
354 * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in 358 * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in