Commit c857b7f4 authored by Matthew Garrett's avatar Matthew Garrett

Revert "hp-wmi: Add support for SMBus hotkeys"

This reverts commit fabf85e3 which breaks
hotkey support on some other HP laptops. We'll try doing this differently
in 3.10.
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 445e8d00
...@@ -134,7 +134,6 @@ static const struct key_entry hp_wmi_keymap[] = { ...@@ -134,7 +134,6 @@ static const struct key_entry hp_wmi_keymap[] = {
{ KE_KEY, 0x2142, { KEY_MEDIA } }, { KE_KEY, 0x2142, { KEY_MEDIA } },
{ KE_KEY, 0x213b, { KEY_INFO } }, { KE_KEY, 0x213b, { KEY_INFO } },
{ KE_KEY, 0x2169, { KEY_DIRECTION } }, { KE_KEY, 0x2169, { KEY_DIRECTION } },
{ KE_KEY, 0x216a, { KEY_SETUP } },
{ KE_KEY, 0x231b, { KEY_HELP } }, { KE_KEY, 0x231b, { KEY_HELP } },
{ KE_END, 0 } { KE_END, 0 }
}; };
...@@ -925,9 +924,6 @@ static int __init hp_wmi_init(void) ...@@ -925,9 +924,6 @@ static int __init hp_wmi_init(void)
err = hp_wmi_input_setup(); err = hp_wmi_input_setup();
if (err) if (err)
return err; return err;
//Enable magic for hotkeys that run on the SMBus
ec_write(0xe6,0x6e);
} }
if (bios_capable) { if (bios_capable) {
......
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