diff options
| author | Matthew Garrett <matthew.garrett@nebula.com> | 2013-04-18 23:53:10 +0200 |
|---|---|---|
| committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-04-18 23:53:10 +0200 |
| commit | c857b7f45b1f9fb7bad1eaa42b8ad68327738232 (patch) | |
| tree | ed7a5efc2d286e4cb416a87d141c40c9c5b463c3 /drivers/platform/x86 | |
| parent | ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it (diff) | |
| download | linux-c857b7f45b1f9fb7bad1eaa42b8ad68327738232.tar.xz linux-c857b7f45b1f9fb7bad1eaa42b8ad68327738232.zip | |
Revert "hp-wmi: Add support for SMBus hotkeys"
This reverts commit fabf85e3ca15d5b94058f391dac8df870cdd427a which breaks
hotkey support on some other HP laptops. We'll try doing this differently
in 3.10.
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 45cacf79f3a7..1a779bbfb87d 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -134,7 +134,6 @@ static const struct key_entry hp_wmi_keymap[] = { { KE_KEY, 0x2142, { KEY_MEDIA } }, { KE_KEY, 0x213b, { KEY_INFO } }, { KE_KEY, 0x2169, { KEY_DIRECTION } }, - { KE_KEY, 0x216a, { KEY_SETUP } }, { KE_KEY, 0x231b, { KEY_HELP } }, { KE_END, 0 } }; @@ -925,9 +924,6 @@ static int __init hp_wmi_init(void) err = hp_wmi_input_setup(); if (err) return err; - - //Enable magic for hotkeys that run on the SMBus - ec_write(0xe6,0x6e); } if (bios_capable) { |