diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-16 05:29:12 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-10-16 05:29:12 +0200 |
| commit | 4c0e799a9a6dc64426ddb6c03aea1a154357658f (patch) | |
| tree | 2d9aa9493d80fceb178a63bf15bb3d9edfc5fbae /drivers/input/serio/i8042-x86ia64io.h | |
| parent | Linux 2.6.27 (diff) | |
| parent | Input: wm97xx - update email address for Liam Girdwood (diff) | |
| download | linux-4c0e799a9a6dc64426ddb6c03aea1a154357658f.tar.xz linux-4c0e799a9a6dc64426ddb6c03aea1a154357658f.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 5aafe24984c5..a321aea2c7b5 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -322,6 +322,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"), }, }, + { + .ident = "IBM 2656", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2656"), + }, + }, { } }; |