Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap...

[deliverable/linux.git] / drivers / platform / x86 / dell-wmi.c

diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 3ea959ecd635828c23cedc6c2d1c5ee86a28e173..15c6f1191aec3f1aa7751b3b935d2d871bc599dd 100644 (file)
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -60,6 +60,14 @@ static int __init dmi_matched(const struct dmi_system_id *dmi)
 }
 
 static const struct dmi_system_id dell_wmi_smbios_list[] __initconst = {
+       {
+               .callback = dmi_matched,
+               .ident = "Dell Inspiron M5110",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron M5110"),
+               },
+       },
        {
                .callback = dmi_matched,
                .ident = "Dell Vostro V131",
@@ -110,8 +118,11 @@ static const struct key_entry dell_wmi_legacy_keymap[] __initconst = {
 
        { KE_IGNORE, 0xe020, { KEY_MUTE } },
 
-       /* Shortcut and audio panel keys */
+       /* Dell Instant Launch key */
        { KE_KEY, 0xe025, { KEY_PROG4 } },
+       { KE_KEY, 0xe029, { KEY_PROG4 } },
+
+       /* Audio panel key */
        { KE_IGNORE, 0xe026, { KEY_RESERVED } },
 
        { KE_IGNORE, 0xe02e, { KEY_VOLUMEDOWN } },