From 7a54d831062f97998772a100b1dc20254ec0307d Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 25 Sep 2007 16:32:08 +0200
Subject: [PATCH] --- yaml --- r: 68667 b: refs/heads/master c:
 f14d5d206cf84357a7072ddb2bbc7d3454639f11 h: refs/heads/master i:   68665:
 bb6843ec48a4914db6aca299bf3d32e6f9ce497b   68663:
 54edb723d7b020d48e7d97f078e8c80c381d503d v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/hid/hid-input.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index c51197d45374..10e61600bd1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5edc41ee8717ef44f6f96347000c8f2c825c823e
+refs/heads/master: f14d5d206cf84357a7072ddb2bbc7d3454639f11
diff --git a/trunk/drivers/hid/hid-input.c b/trunk/drivers/hid/hid-input.c
index bd5a29fe85fc..8be28d205d6d 100644
--- a/trunk/drivers/hid/hid-input.c
+++ b/trunk/drivers/hid/hid-input.c
@@ -762,12 +762,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 				switch(usage->hid & HID_USAGE) {
 					case 0xff05:
 						set_bit(EV_REP, input->evbit);
-						map_key_clear(BTN_0);
-						set_bit(BTN_1, input->keybit);
-						set_bit(BTN_2, input->keybit);
-						set_bit(BTN_3, input->keybit);
-						set_bit(BTN_4, input->keybit);
-						set_bit(BTN_5, input->keybit);
+						map_key_clear(KEY_F13);
+						set_bit(KEY_F14, input->keybit);
+						set_bit(KEY_F15, input->keybit);
+						set_bit(KEY_F16, input->keybit);
+						set_bit(KEY_F17, input->keybit);
+						set_bit(KEY_F18, input->keybit);
 					default:	goto ignore;
 				}
 			} else {
@@ -1034,11 +1034,11 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 		int key = 0;
 		static int last_key = 0;
 		switch (value) {
-			case 0x01: key = BTN_1; break;
-			case 0x02: key = BTN_2; break;
-			case 0x04: key = BTN_3; break;
-			case 0x08: key = BTN_4; break;
-			case 0x10: key = BTN_5; break;
+			case 0x01: key = KEY_F14; break;
+			case 0x02: key = KEY_F15; break;
+			case 0x04: key = KEY_F16; break;
+			case 0x08: key = KEY_F17; break;
+			case 0x10: key = KEY_F18; break;
 			default: break;
 		}
 		if (key) {