* Re: [PATCH] 8250_pnp.c: add another serial Wacom tablet
2009-02-22 19:16 [PATCH] 8250_pnp.c: add another serial Wacom tablet Danny Kukawka
@ 2009-02-23 8:08 ` Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2009-02-23 8:08 UTC (permalink / raw)
To: Danny Kukawka; +Cc: linux-kernel, Matthew Garrett, Alan Cox
On Sun, 22 Feb 2009 20:16:06 +0100 Danny Kukawka <dkukawka@suse.de> wrote:
> From: Danny Kukawka <dkukawka@suse.de>
> Subject: 8250_pnp.c: add another Wacom tablet
>
> Add another serial Wacom tablet with pnp_id: WACF009.
>
> Signed-off-by: Danny Kukawka <dkukawka@suse.de>
> --
> 8250_pnp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
> index bbcfc26..6db9f13 100644
> --- a/drivers/serial/8250_pnp.c
> +++ b/drivers/serial/8250_pnp.c
> @@ -333,6 +333,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
> { "WACF006", 0 },
> { "WACF007", 0 },
> { "WACF008", 0 },
> + { "WACF009", 0 },
> /* Compaq touchscreen */
> { "FPI2002", 0 },
> /* Fujitsu Stylistic touchscreens */
I already had the below queued. Can you review it please?
Alan seems to be having a bit of quiet time so I think I'll merge this
into 2.6.29.
From: Matthew Garrett <mjg59@srcf.ucam.org>
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>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/serial/8250_pnp.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff -puN drivers/serial/8250_pnp.c~serial-update-pnp-ids drivers/serial/8250_pnp.c
--- a/drivers/serial/8250_pnp.c~serial-update-pnp-ids
+++ a/drivers/serial/8250_pnp.c
@@ -333,6 +333,10 @@ static const struct pnp_device_id pnp_de
{ "WACF006", 0 },
{ "WACF007", 0 },
{ "WACF008", 0 },
+ { "WACF009", 0 },
+ { "WACF00A", 0 },
+ { "WACF00B", 0 },
+ { "WACF00C", 0 },
/* Compaq touchscreen */
{ "FPI2002", 0 },
/* Fujitsu Stylistic touchscreens */
@@ -346,8 +350,9 @@ static const struct pnp_device_id pnp_de
{ "FUJ02B8", 0 },
{ "FUJ02B9", 0 },
{ "FUJ02BC", 0 },
- /* Fujitsu Wacom Tablet PC devices */
+ /* Fujitsu Wacom Tablet PC device */
{ "FUJ02E5", 0 },
+ /* Fujitsu P-series tablet PC device */
{ "FUJ02E6", 0 },
/*
* LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in
_
^ permalink raw reply [flat|nested] 2+ messages in thread