From ddaa80ffb98c26b20edeb51bdada5cbbbb158b87 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Thu, 23 Apr 2009 22:38:12 -0400
Subject: [PATCH] --- yaml --- r: 144831 b: refs/heads/master c:
 1002bb77c0b7f1241a5108ffa04d836ddc5060c0 h: refs/heads/master i:   144829:
 6325e53a2e810b34425a75748aae0f5464a5843b   144827:
 e5de40b5f54252a07e8bb81788a8d530feb17b18   144823:
 750311b2184e55ed438e56f3e74941871245bf5f   144815:
 2ccf3ef59006f39d817188abbaa93162ae75c47b   144799:
 4cdbfd20a554ad54eda547e327ae64d92d2705d2   144767:
 34d124dd47b5027b79ce965889f9469d8ccf353b v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/serial/ftdi_sio.c | 2 ++
 trunk/drivers/usb/serial/ftdi_sio.h | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ec334b7cdcaa..516972719115 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10107bd04fc88657204ca40af2ace33626496fd3
+refs/heads/master: 1002bb77c0b7f1241a5108ffa04d836ddc5060c0
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
index 8100f1d25904..aab567644b99 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.c
+++ b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -669,6 +669,8 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(ADI_VID, ADI_GNICE_PID),
 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
 	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
+	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
+		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
 	{ },					/* Optional parameter entry */
 	{ }					/* Terminating entry */
 };
diff --git a/trunk/drivers/usb/serial/ftdi_sio.h b/trunk/drivers/usb/serial/ftdi_sio.h
index c09f658a448b..12330fa1c095 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.h
+++ b/trunk/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