Add usb ftdi_sio patch to series, refresh it, and sign off on it

diff --git a/queue/series b/queue/series
index 19a36cf969598b700b8a5ee5f2354f84c5d457a7..c86eee273f5566581af3ea47ee8954fdde4be3e0 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -6,3 +6,4 @@ netfilter-fix-dhcp-masquerade-problem.patch
 jfs_delete_inode-must-call-clear_inode.patch
 fix-MPOL_F_VERIFY.patch
 fix-more-byte-to-dword-writes-to-PCI_ROM_ADDRESS-config-word.patch
+usb-ftdi_sio-baud-fix.patch

diff --git a/queue/usb-ftdi_sio-baud-fix.patch b/queue/usb-ftdi_sio-baud-fix.patch
index 6d995135a1b6b6aeee83833d0b0dc359d2be7bd5..76acfda8c133abe3cf3fc0301e2193f12238d80a 100644 (file)
--- a/queue/usb-ftdi_sio-baud-fix.patch
+++ b/queue/usb-ftdi_sio-baud-fix.patch
@@ -11,14 +11,16 @@ ftdi_sio: I messed up the baud_base for custom baud rate support in
 
 Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
+Signed-off-by: Chris Wright <chrisw@osdl.org>
 ---
  drivers/usb/serial/ftdi_sio.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertion(+), 1 deletion(-)
 
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c      2005-09-12 10:47:36.000000000 -0700
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c   2005-09-12 11:39:44.000000000 -0700
-@@ -914,7 +914,7 @@ static void ftdi_determine_type(struct u
+Index: linux-2.6.13.y/drivers/usb/serial/ftdi_sio.c
+===================================================================
+--- linux-2.6.13.y.orig/drivers/usb/serial/ftdi_sio.c
++++ linux-2.6.13.y/drivers/usb/serial/ftdi_sio.c
+@@ -874,7 +874,7 @@ static void ftdi_determine_type(struct u
        unsigned interfaces;
  
        /* Assume it is not the original SIO device for now. */