git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
8250_pnp.c
diff --git
a/drivers/tty/serial/8250_pnp.c
b/drivers/tty/serial/8250_pnp.c
index
fc301f6
..
a2f2365
100644
(file)
--- 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 },