Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1d009ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/platform/x86/dell-wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -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 } },