diff --git a/[refs] b/[refs]
index cf5544a929d9..8fed082b7212 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b851d88192c22cf77418a0b4c45b5c789276837
+refs/heads/master: b4bc281266e84e9a432b588ebdcef5fb94dc8ecb
diff --git a/trunk/arch/cris/arch-v10/drivers/sync_serial.c b/trunk/arch/cris/arch-v10/drivers/sync_serial.c
index d2ad9e7a1738..466af40c5822 100644
--- a/trunk/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/trunk/arch/cris/arch-v10/drivers/sync_serial.c
@@ -158,7 +158,7 @@ static int sync_serial_open(struct inode *inode, struct file *file);
 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);