diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /drivers/input/misc/wistron_btns.c | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
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 = { | |||
| 936 | }, | 936 | }, |
| 937 | { | 937 | { |
| 938 | .callback = dmi_matched, | 938 | .callback = dmi_matched, |
| 939 | .ident = "Medion MD 42200", | ||
| 940 | .matches = { | ||
| 941 | DMI_MATCH(DMI_SYS_VENDOR, "Medion"), | ||
| 942 | DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2030"), | ||
| 943 | }, | ||
| 944 | .driver_data = keymap_fs_amilo_pro_v2000 | ||
| 945 | }, | ||
| 946 | { | ||
| 947 | .callback = dmi_matched, | ||
| 939 | .ident = "Medion MD 96500", | 948 | .ident = "Medion MD 96500", |
| 940 | .matches = { | 949 | .matches = { |
| 941 | DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"), | 950 | DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"), |