From 437454ac233527fb41be7387ad980e214d730258 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kvans32@gmail.com>
Date: Thu, 31 Jan 2013 15:44:27 -0500
Subject: [PATCH] --- yaml --- r: 360565 b: refs/heads/master c:
 fabf85e3ca15d5b94058f391dac8df870cdd427a h: refs/heads/master i:   360563:
 eb1fa36308e567877dea0baf2ffc23a668b26ab4 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/platform/x86/hp-wmi.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c57817e6e858..55e5ffdf5d25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2adb95d83f6e915a7d3793a8f6aa8e6e9463357c
+refs/heads/master: fabf85e3ca15d5b94058f391dac8df870cdd427a
diff --git a/trunk/drivers/platform/x86/hp-wmi.c b/trunk/drivers/platform/x86/hp-wmi.c
index 2179c03b94de..be9227dd82be 100644
--- a/trunk/drivers/platform/x86/hp-wmi.c
+++ b/trunk/drivers/platform/x86/hp-wmi.c
@@ -138,6 +138,7 @@ 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 }
 };
@@ -926,6 +927,9 @@ 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) {