diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-18 15:14:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-18 15:14:34 -0700 |
| commit | a86d52667d8eda5de39393ce737794403bdce1eb (patch) | |
| tree | 9f9bc84abe5fdfd6a27905fb35c08949a9bdfe0a /drivers/platform | |
| parent | 0a82a8d132b26d438eb90b3ab35a7016e7227a1d (diff) | |
| parent | c857b7f45b1f9fb7bad1eaa42b8ad68327738232 (diff) | |
| download | blackbird-obmc-linux-a86d52667d8eda5de39393ce737794403bdce1eb.tar.gz blackbird-obmc-linux-a86d52667d8eda5de39393ce737794403bdce1eb.zip | |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform driver revert from Matthew Garrett:
"It turns out that one of the hp-wmi patches this cycle breaks some
other HP laptops. I think we have a good idea how to work on it for
3.10, but it's safer to just revert it for now."
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
Revert "hp-wmi: Add support for SMBus hotkeys"
Diffstat (limited to 'drivers/platform')
| -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) { |
