diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2011-08-16 12:02:28 -0600 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-22 14:18:44 -0700 |
| commit | ab8ba3a2d2cba6a658ef596cd5b2e0905b6c8a9f (patch) | |
| tree | 96335618dae0b6ec30afd527ecc065119d0f1a3f /drivers/tty | |
| parent | drivers/serial/ucc_uart.c: Fix compiler warning (diff) | |
| download | linux-dev-ab8ba3a2d2cba6a658ef596cd5b2e0905b6c8a9f.tar.xz linux-dev-ab8ba3a2d2cba6a658ef596cd5b2e0905b6c8a9f.zip | |
serial: 8250_pnp: add Intermec CV60 touchscreen device
It would have been nice if Intermec had supplied a PNP0501 _CID for the
COM3 device, but they didn't, so we have to recognize it explicitly.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=40612
CC: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable <stable@kernel.org>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250_pnp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250_pnp.c b/drivers/tty/serial/8250_pnp.c index fc301f6722e1..a2f236510ff1 100644 --- a/drivers/tty/serial/8250_pnp.c +++ b/drivers/tty/serial/8250_pnp.c @@ -109,6 +109,9 @@ static const struct pnp_device_id pnp_dev_table[] = { /* IBM */ /* IBM Thinkpad 701 Internal Modem Voice */ { "IBM0033", 0 }, + /* Intermec */ + /* Intermec CV60 touchscreen port */ + { "PNP4972", 0 }, /* Intertex */ /* Intertex 28k8 33k6 Voice EXT PnP */ { "IXDC801", 0 }, |