diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-09 10:26:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-09 10:26:14 -0700 |
| commit | e1d009eab4c7ed6050b24d24b1a971d23d3804f3 (patch) | |
| tree | 583ee2a166368dbe4783c75e5248f591af550023 | |
| parent | cb0d93aaf06d9b23dc2b21b59c6c4bf7da6f0da3 (diff) | |
| parent | 65a97a67a7d7b7a953492573d5740d32510b9daa (diff) | |
| download | linux-e1d009eab4c7ed6050b24d24b1a971d23d3804f3.tar.bz2 | |
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
| -rw-r--r-- | drivers/platform/x86/dell-wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index d2bc092defd7..da2fe18162e1 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -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 } }, |