Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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"
-4
-4
drivers/platform/x86/hp-wmi.c
-4
drivers/platform/x86/hp-wmi.c
···
134
134
{ KE_KEY, 0x2142, { KEY_MEDIA } },
135
135
{ KE_KEY, 0x213b, { KEY_INFO } },
136
136
{ KE_KEY, 0x2169, { KEY_DIRECTION } },
137
-
{ KE_KEY, 0x216a, { KEY_SETUP } },
138
137
{ KE_KEY, 0x231b, { KEY_HELP } },
139
138
{ KE_END, 0 }
140
139
};
···
924
925
err = hp_wmi_input_setup();
925
926
if (err)
926
927
return err;
927
-
928
-
//Enable magic for hotkeys that run on the SMBus
929
-
ec_write(0xe6,0x6e);
930
928
}
931
929
932
930
if (bios_capable) {