3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Keng-Yu Lin <[email protected]>

commit 6c30d5a53229aad22bb675e0bd6eb518ecaa4316 upstream.

Add support for the camera key. The hotkey for
Asus S.H.E(Super Hybrid Engine) mode is mapped to KEY_KEY_PROG1
just for notifying the userspace.

Signed-off-by: Keng-Yu Lin <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/hid/hid-chicony.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/hid/hid-chicony.c
+++ b/drivers/hid/hid-chicony.c
@@ -49,6 +49,8 @@ static int ch_input_mapping(struct hid_d
        case 0x00f2: ch_map_key_clear(KEY_BRIGHTNESSDOWN);      break;
        case 0x00f3: ch_map_key_clear(KEY_BRIGHTNESSUP);        break;
        case 0x00f4: ch_map_key_clear(KEY_DISPLAY_OFF); break;
+       case 0x00f7: ch_map_key_clear(KEY_CAMERA);      break;
+       case 0x00f8: ch_map_key_clear(KEY_PROG1);       break;
        default:
                return 0;
        }


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to