From 3fa31d274315968deeee3432d4e8cabbb7e3968f Mon Sep 17 00:00:00 2001
From: Keng-Yu Lin <kengyu@canonical.com>
Date: Fri, 6 Jul 2012 18:06:11 +0800
Subject: [PATCH] --- yaml --- r: 316059 b: refs/heads/master c:
 929578ab0339fe42bb3ceeaa2e6607189cddf70b h: refs/heads/master i:   316057:
 a5b691ed90983159ad948fc1ee9cd79b5fe1e006   316055:
 a59cd00690eb8659d6629e6610c86635b01bec50 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hid/hid-input.c | 9 +++++++++
 trunk/include/linux/hid.h     | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74aef8b5150d..99b55a3397f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25976a796cca22d6b0b2e9f821fa00fc4d98daa0
+refs/heads/master: 929578ab0339fe42bb3ceeaa2e6607189cddf70b
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/drivers/hid/hid-input.c
index 132b0019365e..879443bf410f 100644
--- a/trunk/drivers/hid/hid-input.c
+++ b/trunk/drivers/hid/hid-input.c
@@ -834,6 +834,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 		}
 		break;
 
+	case HID_UP_HPVENDOR2:
+		set_bit(EV_REP, input->evbit);
+		switch (usage->hid & HID_USAGE) {
+		case 0x003: map_key_clear(KEY_BRIGHTNESSDOWN);	break;
+		case 0x004: map_key_clear(KEY_BRIGHTNESSUP);	break;
+		default:    goto ignore;
+		}
+		break;
+
 	case HID_UP_MSVENDOR:
 		goto ignore;
 
diff --git a/trunk/include/linux/hid.h b/trunk/include/linux/hid.h
index 449fa385703d..42970de1b40c 100644
--- a/trunk/include/linux/hid.h
+++ b/trunk/include/linux/hid.h
@@ -200,6 +200,7 @@ struct hid_item {
 #define HID_UP_DIGITIZER	0x000d0000
 #define HID_UP_PID		0x000f0000
 #define HID_UP_HPVENDOR         0xff7f0000
+#define HID_UP_HPVENDOR2        0xff010000
 #define HID_UP_MSVENDOR		0xff000000
 #define HID_UP_CUSTOM		0x00ff0000
 #define HID_UP_LOGIVENDOR	0xffbc0000