From c5f1070f819c72aad2a902b7b9a141824c11c9e4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 29 Jun 2005 16:53:29 -0700
Subject: [PATCH] --- yaml --- r: 4607 b: refs/heads/master c:
 16966f2ab7db7366855d1267071a3138ae127ff6 h: refs/heads/master i:   4605:
 b0d389195e4673f737c8bde7fa1dc61f3e631814   4603:
 73a2c19bf7ac8234fc614a25ec73767d4d190778   4599:
 bf9f1df246940627fe85fd8487aff0010238429a   4591:
 fe72e1314c9101b9703707c5fb80372faf0b9844   4575:
 e860233bb08152dbd558365e3fc93b75bc8696a3   4543:
 3248091ed75b3b3829a61a0f9ae3947572dba1c3   4479:
 3bdd296170dc216b537f41df5c4fd3d0d16b49a2   4351:
 fd5d2295082f60c95ad07bf0fa8ff3569068ee06   4095:
 39ad1eed1795cfe398d90d135adf04b6fc26ea86 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/serial/ftdi_sio.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd89f3d70a1a..4c0472eba8b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e33ae67815372a93e8e77624fd47e39a986415d
+refs/heads/master: 16966f2ab7db7366855d1267071a3138ae127ff6
diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c
index aad2f4d0e09c..0b03ddab53d9 100644
--- a/trunk/drivers/usb/serial/ftdi_sio.c
+++ b/trunk/drivers/usb/serial/ftdi_sio.c
@@ -1978,8 +1978,6 @@ static int ftdi_ioctl (struct usb_serial_port *port, struct file * file, unsigne
 {
 	struct ftdi_private *priv = usb_get_serial_port_data(port);
 
-	int  ret, mask;
-	
 	dbg("%s cmd 0x%04x", __FUNCTION__, cmd);
 
 	/* Based on code from acm.c and others */