diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 09:49:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 09:49:16 -0800 |
| commit | e7de369050534025b33aab1033358bf47a577e4d (patch) | |
| tree | fed44f469923690b98f9de2c87e6d1de76f71dc9 /drivers/input/serio | |
| parent | 87530db5ec7d519c7ba334e414307c5130ae2da8 (diff) | |
| parent | eab9edd27f7ceaad6b57085817d63287bda15190 (diff) | |
| download | op-kernel-dev-e7de369050534025b33aab1033358bf47a577e4d.zip op-kernel-dev-e7de369050534025b33aab1033358bf47a577e4d.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/input/serio')
| -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 2d2f9fb..a4c6f35 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -173,6 +173,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "PC-MM20 Series"), }, }, + { + .ident = "Sony Vaio FS-115b", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FS115B"), + }, + }, { } }; |
