diff options
| author | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2009-10-27 23:45:17 +0100 |
| commit | e343eb0d60f74547e0aeb5bd151105c2e6cfe588 (patch) | |
| tree | 92586df0daf3298262a957640e5c86679c963f41 /drivers/input/misc/wistron_btns.c | |
| parent | nfsd41: use sv_max_mesg for forechannel max sizes (diff) | |
| parent | Linux 2.6.32-rc5 (diff) | |
| download | kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.gz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.tar.xz kernel-qcow2-linux-e343eb0d60f74547e0aeb5bd151105c2e6cfe588.zip | |
Merge commit 'v2.6.32-rc5' into for-2.6.33
Diffstat (limited to 'drivers/input/misc/wistron_btns.c')
| -rw-r--r-- | drivers/input/misc/wistron_btns.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index 11fd038a078f..a932179c4c9e 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c @@ -936,6 +936,15 @@ static struct dmi_system_id dmi_ids[] __initdata = { }, { .callback = dmi_matched, + .ident = "Medion MD 42200", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Medion"), + DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2030"), + }, + .driver_data = keymap_fs_amilo_pro_v2000 + }, + { + .callback = dmi_matched, .ident = "Medion MD 96500", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"), |