diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:41:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:41:29 -0700 |
| commit | 63995344721be45b3fb3b76488b1b0a8c95def26 (patch) | |
| tree | a28385324c992c75bd7895fcfd3e374b5214aa53 /drivers/input/serio/i8042-x86ia64io.h | |
| parent | 9de6886ec6e37f45807266a702bb7621498395ad (diff) | |
| parent | 2bcaa6a4238094c5695d5b1943078388d82d3004 (diff) | |
| download | linux-3.10-63995344721be45b3fb3b76488b1b0a8c95def26.tar.gz linux-3.10-63995344721be45b3fb3b76488b1b0a8c95def26.tar.bz2 linux-3.10-63995344721be45b3fb3b76488b1b0a8c95def26.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: atkbd - add Compaq Presario R4000-series repeat quirk
Input: i8042 - add Acer Aspire 5536 to the nomux list
Diffstat (limited to 'drivers/input/serio/i8042-x86ia64io.h')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index ae04d8a494e..ccbf23ece8e 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -382,6 +382,14 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Vostro1510"), }, }, + { + .ident = "Acer Aspire 5536", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5536"), + DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), + }, + }, { } }; |