diff options
author | Matthew Garrett <mjg@redhat.com> | 2010-05-19 13:11:13 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:13:50 -0400 |
commit | 09fac079d9d21c219df211559528cbe8439af59d (patch) | |
tree | 0ddcb57bc22b80c0053b15eca3b4f0c218e952b0 /drivers/input/serio | |
parent | af8b01b03941e6b008d63b42c0433699c3d3d184 (diff) |
Input: i8042 - add some extra PNP keyboard types
Some Japanese machines declare their keyboard with a different PNP ID.
Add it to the list of probed device IDs. While we're at it, add all the
other IDs that Windows binds to - we'll probably never see them in the
real world, but it doesn't hurt.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index ead0494721d0..871a74c722a0 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
@@ -660,8 +660,21 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id * | |||
660 | } | 660 | } |
661 | 661 | ||
662 | static struct pnp_device_id pnp_kbd_devids[] = { | 662 | static struct pnp_device_id pnp_kbd_devids[] = { |
663 | { .id = "PNP0300", .driver_data = 0 }, | ||
664 | { .id = "PNP0301", .driver_data = 0 }, | ||
665 | { .id = "PNP0302", .driver_data = 0 }, | ||
663 | { .id = "PNP0303", .driver_data = 0 }, | 666 | { .id = "PNP0303", .driver_data = 0 }, |
667 | { .id = "PNP0304", .driver_data = 0 }, | ||
668 | { .id = "PNP0305", .driver_data = 0 }, | ||
669 | { .id = "PNP0306", .driver_data = 0 }, | ||
670 | { .id = "PNP0309", .driver_data = 0 }, | ||
671 | { .id = "PNP030a", .driver_data = 0 }, | ||
664 | { .id = "PNP030b", .driver_data = 0 }, | 672 | { .id = "PNP030b", .driver_data = 0 }, |
673 | { .id = "PNP0320", .driver_data = 0 }, | ||
674 | { .id = "PNP0343", .driver_data = 0 }, | ||
675 | { .id = "PNP0344", .driver_data = 0 }, | ||
676 | { .id = "PNP0345", .driver_data = 0 }, | ||
677 | { .id = "CPQA0D7", .driver_data = 0 }, | ||
665 | { .id = "", }, | 678 | { .id = "", }, |
666 | }; | 679 | }; |
667 | 680 | ||