From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Wed, 3 Aug 2011 23:21:14 +0000 (-0700)
Subject: cris: fix the prototype of sync_serial_ioctl()
X-Git-Tag: v3.1-rc1~65
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4bc281266e84e9a432b588ebdcef5fb94dc8ecb;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed