diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 21:47:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 21:47:30 -0700 |
| commit | 7686ad5606f08d9dfb33a2087a36c8366366015b (patch) | |
| tree | da2b7739ccf603949b3ecc3aa55884efb19dd7f8 /drivers/input/serio | |
| parent | 64f996f670e9477072a43b226294ea1cc153f6ac (diff) | |
| parent | 9ce1ca284a322ba6f9d691136a29c9cfe381e1fc (diff) | |
| download | op-kernel-dev-7686ad5606f08d9dfb33a2087a36c8366366015b.zip op-kernel-dev-7686ad5606f08d9dfb33a2087a36c8366366015b.tar.gz | |
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: i8042 - make Lenovo 3000 N100 blacklist entry more specific
Input: bcm5974 - add BTN_TOUCH event for mousedev benefit
Input: bcm5974 - improve finger tracking and counting
Input: bcm5974 - small formatting cleanup
Input: bcm5974 - add maintainer entry
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 3282b74..5aafe24 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -305,7 +305,7 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { .ident = "Lenovo 3000 n100", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"), + DMI_MATCH(DMI_PRODUCT_NAME, "076804U"), }, }, { |
