Commit e1d009ea authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'platform-drivers-x86-v4.8-3' of...

Merge tag 'platform-drivers-x86-v4.8-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver update from Darren Hart:
 "dell-wmi: ignore battery remove/insert event"

* tag 'platform-drivers-x86-v4.8-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  dell-wmi: Ignore WMI event 0xe00e
parents cb0d93aa 65a97a67
...@@ -110,8 +110,8 @@ static const struct key_entry dell_wmi_keymap_type_0000[] __initconst = { ...@@ -110,8 +110,8 @@ static const struct key_entry dell_wmi_keymap_type_0000[] __initconst = {
/* BIOS error detected */ /* BIOS error detected */
{ KE_IGNORE, 0xe00d, { KEY_RESERVED } }, { KE_IGNORE, 0xe00d, { KEY_RESERVED } },
/* Unknown, defined in ACPI DSDT */ /* Battery was removed or inserted */
/* { KE_IGNORE, 0xe00e, { KEY_RESERVED } }, */ { KE_IGNORE, 0xe00e, { KEY_RESERVED } },
/* Wifi Catcher */ /* Wifi Catcher */
{ KE_KEY, 0xe011, { KEY_PROG2 } }, { KE_KEY, 0xe011, { KEY_PROG2 } },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment