Merge branch 'linus' into core/iommu

[~andy/linux] / drivers / usb / serial / ftdi_sio.h

diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index c09f658a448b8a0c8807e072b9a89e1fe45ae69b..12330fa1c095b47fd875a758a3ae9eea56d7d914 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -919,6 +919,12 @@
 #define JETI_VID               0x0c6c
 #define JETI_SPC1201_PID       0x04b2
 
+/*
+ * Marvell SheevaPlug
+ */
+#define MARVELL_VID            0x9e88
+#define MARVELL_SHEEVAPLUG_PID 0x9e8f
+
 /*
  *   BmRequestType:  1100 0000b
  *   bRequest:       FTDI_E2_READ