summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2017-03-16 15:43:32 +0000
committerian <ian@FreeBSD.org>2017-03-16 15:43:32 +0000
commit05a2c39b0e37a34bbd587cca6f54c8e9ba90b5e3 (patch)
tree479fb55bf1dc4f4f7ca7554efb5db31f16fdaa90
parentf9dcd76f4bf7307298b3fd35fe4556149416b1ae (diff)
downloadFreeBSD-src-05a2c39b0e37a34bbd587cca6f54c8e9ba90b5e3.zip
FreeBSD-src-05a2c39b0e37a34bbd587cca6f54c8e9ba90b5e3.tar.gz
MFC r314918, r314919:
Add the pnp id for a Wacom 'WACF00e' tablet. Update the comment for the Wacom WACF00e to make it clear it's not an accidental duplicate of WACF004. PR: 217306
-rw-r--r--sys/dev/uart/uart_bus_acpi.c1
-rw-r--r--sys/dev/uart/uart_bus_isa.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index ccd213d..018e6b9 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -64,6 +64,7 @@ static struct isa_pnp_id acpi_ns8250_ids[] = {
{0x1005d041, "Generic IRDA-compatible device"}, /* PNP0510 */
{0x1105d041, "Generic IRDA-compatible device"}, /* PNP0511 */
{0x04f0235c, "Wacom Tablet PC Screen"}, /* WACF004 */
+ {0x0ef0235c, "Wacom Tablet PC Screen 00e"}, /* WACF00e */
{0xe502aa1a, "Wacom Tablet at FuS Lifebook T"}, /* FUJ02E5 */
{0}
};
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 1fda15f..af9b0f1 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -142,7 +142,8 @@ static struct isa_pnp_id isa_ns8250_ids[] = {
{0x90307256, NULL}, /* USR3090 - USR ? */
{0x70917256, NULL}, /* USR9170 - U.S. Robotics 56K FAX INT */
{0x90917256, NULL}, /* USR9190 - USR 56k Voice INT */
- {0x04f0235c, NULL}, /* WACF004 - Wacom Tablet PC Screen*/
+ {0x04f0235c, NULL}, /* WACF004 - Wacom Tablet PC Screen */
+ {0x0ef0235c, NULL}, /* WACF00e - Wacom Tablet PC Screen 00e */
{0x0300695c, NULL}, /* WCI0003 - Fax/Voice/Modem/Speakphone/Asvd */
{0x01a0896a, NULL}, /* ZTIA001 - Zoom Internal V90 Faxmodem */
{0x61f7896a, NULL}, /* ZTIF761 - Zoom ComStar 33.6 */
OpenPOWER on IntegriCloud