From e2bc90748aa2eede4fb05a2b05f5182c2019b011 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 19 May 2010 10:11:13 -0700 Subject: [PATCH] --- yaml --- r: 193535 b: refs/heads/master c: 09fac079d9d21c219df211559528cbe8439af59d h: refs/heads/master i: 193533: f07ea7bcc69fe5257019088ab7d63506b5771a70 193531: 01bed10be6b738b316cc94bd45f157099e274f1d 193527: 8472af72826c3a9e602e28085dfc317b27e72678 193519: 5b3439f24ec69459ff875f3d86e4dafae01238f4 193503: fbd90090b98cb6a4bece215f6deda3647d6c70f5 193471: 5560c5a9b90868c983b5e299cd35639a07341b90 193407: 129e48f6256ceb8be8c0ffdbc109034f5ec755c1 193279: ded14740b1f92f39632417bbcf7c2c6475952816 193023: d0e3a0d93bd3e461e49bd81d5986a0ddac238725 192511: 9325e2bfdab79e49b7c0cb495169b590fb8ee8d3 v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f00ab2880bb..d114439387f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af8b01b03941e6b008d63b42c0433699c3d3d184 +refs/heads/master: 09fac079d9d21c219df211559528cbe8439af59d diff --git a/trunk/drivers/input/serio/i8042-x86ia64io.h b/trunk/drivers/input/serio/i8042-x86ia64io.h index ead0494721d0..871a74c722a0 100644 --- a/trunk/drivers/input/serio/i8042-x86ia64io.h +++ b/trunk/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 * } static struct pnp_device_id pnp_kbd_devids[] = { + { .id = "PNP0300", .driver_data = 0 }, + { .id = "PNP0301", .driver_data = 0 }, + { .id = "PNP0302", .driver_data = 0 }, { .id = "PNP0303", .driver_data = 0 }, + { .id = "PNP0304", .driver_data = 0 }, + { .id = "PNP0305", .driver_data = 0 }, + { .id = "PNP0306", .driver_data = 0 }, + { .id = "PNP0309", .driver_data = 0 }, + { .id = "PNP030a", .driver_data = 0 }, { .id = "PNP030b", .driver_data = 0 }, + { .id = "PNP0320", .driver_data = 0 }, + { .id = "PNP0343", .driver_data = 0 }, + { .id = "PNP0344", .driver_data = 0 }, + { .id = "PNP0345", .driver_data = 0 }, + { .id = "CPQA0D7", .driver_data = 0 }, { .id = "", }, };