diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2011-08-03 16:21:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:31 -0700 |
| commit | 8ab2e3a2ae06bdd02b2a7269ef6ed896540a6170 (patch) | |
| tree | a0d9d37aadc0efe85f13a43cba733dfcd6f70d99 /arch/cris | |
| parent | a2708fa28f668db0b9103fc051b9c464695840a8 (diff) | |
| download | kernel_samsung_tuna-8ab2e3a2ae06bdd02b2a7269ef6ed896540a6170.zip kernel_samsung_tuna-8ab2e3a2ae06bdd02b2a7269ef6ed896540a6170.tar.gz kernel_samsung_tuna-8ab2e3a2ae06bdd02b2a7269ef6ed896540a6170.tar.bz2 | |
cris: fix the prototype of sync_serial_ioctl()
commit b4bc281266e84e9a432b588ebdcef5fb94dc8ecb upstream.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/cris')
| -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 d2ad9e7..466af40 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); 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); |