From 3651b14b5fedcbaf6ea9cf45debe7cf086f729aa Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 1 Mar 2011 13:12:47 +0800
Subject: [PATCH] --- yaml --- r: 235572 b: refs/heads/master c:
 751b3840d216f1ecd3b91ff5251bf7703b690cd8 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/char/pcmcia/synclink_cs.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6643bcc02dd4..bbf343278734 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c976cc3aa99e813084fc4bd295c9f7b706738b48
+refs/heads/master: 751b3840d216f1ecd3b91ff5251bf7703b690cd8
diff --git a/trunk/drivers/char/pcmcia/synclink_cs.c b/trunk/drivers/char/pcmcia/synclink_cs.c
index 02127cad0980..beca80bb9bdb 100644
--- a/trunk/drivers/char/pcmcia/synclink_cs.c
+++ b/trunk/drivers/char/pcmcia/synclink_cs.c
@@ -2222,13 +2222,12 @@ static int mgslpc_get_icount(struct tty_struct *tty,
  * Arguments:
  *
  * 	tty	pointer to tty instance data
- * 	file	pointer to associated file object for device
  * 	cmd	IOCTL command code
  * 	arg	command argument/context
  *
  * Return Value:	0 if success, otherwise error code
  */
-static int mgslpc_ioctl(struct tty_struct *tty, struct file * file,
+static int mgslpc_ioctl(struct tty_struct *tty,
 			unsigned int cmd, unsigned long arg)
 {
 	MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data;