From ffc880f98903a80176637da8c999985f15df4cbb Mon Sep 17 00:00:00 2001
From: Rok Mandeljc <rok.mandeljc@gmail.com>
Date: Thu, 30 Sep 2010 23:24:30 +0200
Subject: [PATCH] --- yaml --- r: 215551 b: refs/heads/master c:
 8038298fde28a533da52a47fac87106b4bf9816c h: refs/heads/master i:   215549:
 6c3491e3c09a246c0ccef257f8df534f55143427   215547:
 dff0b11b99ce435d5659f292ea0724b6744376f6   215543:
 091b126a3e62eaff55eef0fb8e1019cbe9b67db1   215535:
 0c8ec435ed29b2bc22933b73e9b4ba9c1513616b   215519:
 1edcd51247cafa094a54633e269ed0150386629e   215487:
 c262e7969af9a269bd6c488bdee5c54dc1154470   215423:
 a7546c32a4d912d3f95ec866e6be78096d734635   215295:
 55b3d532c9f8e86286e5ed7fe14e25a73896e622   215039:
 452be467ba771d1d3d8e62d93b5ba6c67e06f741 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/hid/hid-ids.h           | 1 +
 trunk/drivers/hid/usbhid/hid-quirks.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index db77de91ab24..58a8704f1d4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50bb6d8492ff0c3f204b263aff90d4a7ebf4dd90
+refs/heads/master: 8038298fde28a533da52a47fac87106b4bf9816c
diff --git a/trunk/drivers/hid/hid-ids.h b/trunk/drivers/hid/hid-ids.h
index 778dd4230ae9..49ec747f6bb9 100644
--- a/trunk/drivers/hid/hid-ids.h
+++ b/trunk/drivers/hid/hid-ids.h
@@ -142,6 +142,7 @@
 #define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051
 #define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE	0x00ff
 #define USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK	0x00d3
+#define USB_DEVICE_ID_CH_AXIS_295	0x001c
 
 #define USB_VENDOR_ID_CHERRY		0x046a
 #define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023
diff --git a/trunk/drivers/hid/usbhid/hid-quirks.c b/trunk/drivers/hid/usbhid/hid-quirks.c
index 70da3181c8a0..c52c36d0ca58 100644
--- a/trunk/drivers/hid/usbhid/hid-quirks.c
+++ b/trunk/drivers/hid/usbhid/hid-quirks.c
@@ -62,6 +62,7 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
+	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },