---

yaml --- r: 8462 b: refs/heads/master c: b8c9c64 h: refs/heads/master v: v3
git-mirror · Sep 5, 2005 · fa5fa12 · fa5fa12
1 parent ab38c1a
commit fa5fa12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7545c24c6a6ab62922266197a72119212280ea2a
+refs/heads/master: b8c9c642db4ab0811cc5bb0d8b90cc7819055c95
diff --git a/trunk/drivers/usb/input/hid-input.c b/trunk/drivers/usb/input/hid-input.c
@@ -296,6 +296,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 			break;
 
 		case HID_UP_MSVENDOR:
+		case HID_UP_LOGIVENDOR:
 
 			goto ignore;
 

diff --git a/trunk/drivers/usb/input/hid.h b/trunk/drivers/usb/input/hid.h
@@ -182,6 +182,7 @@ struct hid_item {
 #define HID_UP_PID		0x000f0000
 #define HID_UP_HPVENDOR         0xff7f0000
 #define HID_UP_MSVENDOR		0xff000000
+#define HID_UP_LOGIVENDOR	0x00ff0000
 
 #define HID_USAGE		0x0000ffff
-Original file line number
+Diff line change
@@ Expand Up @@
     			break;
     		case HID_UP_MSVENDOR:
+    		case HID_UP_LOGIVENDOR:
     			goto ignore;
@@ Expand Down @@