diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /drivers/misc/hp-wmi.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'drivers/misc/hp-wmi.c')
| -rw-r--r-- | drivers/misc/hp-wmi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/hp-wmi.c b/drivers/misc/hp-wmi.c index 5dabfb69ee53..4b7c24c519c3 100644 --- a/drivers/misc/hp-wmi.c +++ b/drivers/misc/hp-wmi.c | |||
| @@ -82,6 +82,7 @@ static struct key_entry hp_wmi_keymap[] = { | |||
| 82 | {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, | 82 | {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, |
| 83 | {KE_KEY, 0x20e6, KEY_PROG1}, | 83 | {KE_KEY, 0x20e6, KEY_PROG1}, |
| 84 | {KE_KEY, 0x2142, KEY_MEDIA}, | 84 | {KE_KEY, 0x2142, KEY_MEDIA}, |
| 85 | {KE_KEY, 0x213b, KEY_INFO}, | ||
| 85 | {KE_KEY, 0x231b, KEY_HELP}, | 86 | {KE_KEY, 0x231b, KEY_HELP}, |
| 86 | {KE_END, 0} | 87 | {KE_END, 0} |
| 87 | }; | 88 | }; |