3.0-stable review patch. If anyone has any objections, please let us know.
------------------
From: WANG Cong <xiyou.wangc...@gmail.com>
commit b4bc281266e84e9a432b588ebdcef5fb94dc8ecb upstream.
Fix:
arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for
'sync_serial_ioctl'
Reported-by: Geert Uytterhoeven <ge...@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangc...@gmail.com>
Cc: Mikael Starvik <star...@axis.com>
Cc: Jesper Nilsson <jesper.nils...@axis.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
arch/cris/arch-v10/drivers/sync_serial.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -158,7 +158,7 @@ static int sync_serial_open(struct inode
static int sync_serial_release(struct inode *inode, struct file *file);
static unsigned int sync_serial_poll(struct file *filp, poll_table *wait);
-static int sync_serial_ioctl(struct file *file,
+static long sync_serial_ioctl(struct file *file,
unsigned int cmd, unsigned long arg);
static ssize_t sync_serial_write(struct file *file, const char *buf,
size_t count, loff_t *ppos);
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
