diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2011-08-03 19:21:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 20:25:22 -0400 |
commit | b4bc281266e84e9a432b588ebdcef5fb94dc8ecb (patch) | |
tree | 0ba15c71f7f0ad206fe899a7fa46f18d8f77cf1b /arch/cris/arch-v10 | |
parent | 4b851d88192c22cf77418a0b4c45b5c789276837 (diff) |
cris: fix the prototype of sync_serial_ioctl()
Fix:
arch/cris/arch-v10/drivers/sync_serial.c:961: error: conflicting types for 'sync_serial_ioctl'
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/arch-v10')
-rw-r--r-- | arch/cris/arch-v10/drivers/sync_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c index d2ad9e7a1738..466af40c5822 100644 --- 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 *inode, struct file *file); | |||
158 | static int sync_serial_release(struct inode *inode, struct file *file); | 158 | static int sync_serial_release(struct inode *inode, struct file *file); |
159 | static unsigned int sync_serial_poll(struct file *filp, poll_table *wait); | 159 | static unsigned int sync_serial_poll(struct file *filp, poll_table *wait); |
160 | 160 | ||
161 | static int sync_serial_ioctl(struct file *file, | 161 | static long sync_serial_ioctl(struct file *file, |
162 | unsigned int cmd, unsigned long arg); | 162 | unsigned int cmd, unsigned long arg); |
163 | static ssize_t sync_serial_write(struct file *file, const char *buf, | 163 | static ssize_t sync_serial_write(struct file *file, const char *buf, |
164 | size_t count, loff_t *ppos); | 164 | size_t count, loff_t *ppos); |