From f14e8a710c17b1c15412911bf910e0d318609225 Mon Sep 17 00:00:00 2001
From: Rafi Rubin <rafi@ugcs.caltech.edu>
Date: Wed, 28 Jul 2010 20:04:10 -0400
Subject: [PATCH] Add ntrig vendor and device codes.

Signed-off-by: Rafi Rubin <rafi@ugcs.caltech.edu>
Tested-by: Thomas Spura <spurath@students.uni-mainz.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/wcmUSB.c        |    5 ++++-
 src/xf86WacomDefs.h |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 2bbf1e3..c41a67b 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -471,7 +471,10 @@ static struct
 	{ WALTOP_VENDOR_ID, 0x500, 2540, 2540, &usbBamboo    },
 	{ WALTOP_VENDOR_ID, 0x501, 2540, 2540, &usbBamboo    },
 	{ WALTOP_VENDOR_ID, 0x502, 5080, 5080, &usbIntuos4   },
-	{ WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4   }
+	{ WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4   },
+
+	/* N-Trig devices */
+	{ NTRIG_VENDOR_ID,  0x01, 1122, 934, &usbTabletPC    }
 };
 
 static Bool usbWcmInit(LocalDevicePtr local, char* id, float *version)
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index d9baea2..14409b5 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -30,6 +30,7 @@
 /* vendor IDs on the kernel device */
 #define WACOM_VENDOR_ID 0x056a
 #define WALTOP_VENDOR_ID 0x172F
+#define NTRIG_VENDOR_ID 0x1b96
 
 #define DEFAULT_SUPPRESS 2      /* default suppress */
 #define MAX_SUPPRESS 100        /* max value of suppress */
-- 
1.7.2