Skip to content

Commit

Permalink
Merge tag 'platform-drivers-x86-v4.8-3' of git://git.infradead.org/us…
Browse files Browse the repository at this point in the history
…ers/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
  • Loading branch information
torvalds committed Aug 9, 2016
2 parents cb0d93a + 65a97a6 commit e1d009e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/platform/x86/dell-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ static const struct key_entry dell_wmi_keymap_type_0000[] __initconst = {
/* BIOS error detected */
{ KE_IGNORE, 0xe00d, { KEY_RESERVED } },

/* Unknown, defined in ACPI DSDT */
/* { KE_IGNORE, 0xe00e, { KEY_RESERVED } }, */
/* Battery was removed or inserted */
{ KE_IGNORE, 0xe00e, { KEY_RESERVED } },

/* Wifi Catcher */
{ KE_KEY, 0xe011, { KEY_PROG2 } },
Expand Down

0 comments on commit e1d009e

Please sign in to comment.