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

[linux-2.6] / drivers / usb / serial / cypress_m8.h

diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h
index 1fa119efe41a0276c412a9a5ed8f5ff6ce1ecaf8..e772b01ac3ac0a6159b508dced9cb2132d0b8222 100644 (file)
--- a/drivers/usb/serial/cypress_m8.h
+++ b/drivers/usb/serial/cypress_m8.h
@@ -18,6 +18,14 @@
 /* Cypress HID->COM RS232 Adapter */
 #define VENDOR_ID_CYPRESS               0x04b4
 #define PRODUCT_ID_CYPHIDCOM            0x5500
+
+/* Powercom UPS, chip CY7C63723 */
+#define VENDOR_ID_POWERCOM              0x0d9f
+#define PRODUCT_ID_UPS                  0x0002
+
+/* Nokia CA-42 USB to serial cable */
+#define VENDOR_ID_DAZZLE               0x07d0
+#define PRODUCT_ID_CA42                        0x4101
 /* End of device listing */
 
 /* Used for setting / requesting serial line settings */
@@ -34,6 +42,7 @@
 
 #define CT_EARTHMATE   0x01
 #define CT_CYPHIDCOM   0x02
+#define CT_CA42V2      0x03
 #define CT_GENERIC     0x0F
 /* End of chiptype definitions */
 
@@ -45,7 +54,7 @@
 #define UART_DSR       0x20    /* data set ready - flow control - device to host */
 #define CONTROL_RTS    0x10    /* request to send - flow control - host to device */
 #define UART_CTS       0x10    /* clear to send - flow control - device to host */
-#define        UART_RI         0x10    /* ring indicator - modem - device to host */ 
+#define        UART_RI         0x10    /* ring indicator - modem - device to host */
 #define UART_CD                0x40    /* carrier detect - modem - device to host */
 #define CYP_ERROR      0x08    /* received from input report - device to host */
 /* Note - the below has nothing to to with the "feature report" reset */