Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6-block.git] / drivers / hid / hid-ids.h

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 548c1a51959334e867b27c73ae20d682515c9149..bd221263c739d61f8df1be33b0a0ea0181d76657 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -247,6 +247,8 @@
 #define USB_DEVICE_ID_FOCALTECH_FTXXXX_MULTITOUCH      0x81b9
 #define USB_DEVICE_ID_CYGNAL_CP2112    0xea90
 
+#define USB_DEVICE_ID_CYGNAL_RADIO_SI4713       0x8244
+
 #define USB_VENDOR_ID_CYPRESS          0x04b4
 #define USB_DEVICE_ID_CYPRESS_MOUSE    0x0001
 #define USB_DEVICE_ID_CYPRESS_HIDCOM   0x5500
@@ -964,4 +966,7 @@
 #define USB_DEVICE_ID_PRIMAX_KEYBOARD  0x4e05
 
 
+#define USB_VENDOR_ID_RISO_KAGAKU      0x1294  /* Riso Kagaku Corp. */
+#define USB_DEVICE_ID_RI_KA_WEBMAIL    0x1320  /* Webmail Notifier */
+
 #endif