diff --git a/[refs] b/[refs] index 4eff8036338d..83bd978eb292 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 181d5762bd8eaa2881b7df27bad260bf4abda1bc +refs/heads/master: ab8ba3a2d2cba6a658ef596cd5b2e0905b6c8a9f diff --git a/trunk/drivers/tty/serial/8250_pnp.c b/trunk/drivers/tty/serial/8250_pnp.c index fc301f6722e1..a2f236510ff1 100644 --- a/trunk/drivers/tty/serial/8250_pnp.c +++ b/trunk/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 },