drm: merge in Linus mainline

[powerpc.git] / drivers / usb / serial / pl2303.h

diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index b734c40..21d434d 100644 (file)
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -54,7 +54,13 @@
 #define SAMSUNG_PRODUCT_ID     0x8001
 
 #define SIEMENS_VENDOR_ID      0x11f5
+#define SIEMENS_PRODUCT_ID_SX1 0x0001
 #define SIEMENS_PRODUCT_ID_X65 0x0003
+#define SIEMENS_PRODUCT_ID_X75 0x0004
 
 #define SYNTECH_VENDOR_ID      0x0745
 #define SYNTECH_PRODUCT_ID     0x0001
+
+/* Nokia CA-42 Cable */
+#define NOKIA_CA42_VENDOR_ID   0x078b
+#define NOKIA_CA42_PRODUCT_ID  0x1234