Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-01-20 16:25:33 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-20 16:25:33 -0800
commit6aba8f35bd088935bebd109218ef0f287a1cdc9c (patch)
tree370f720934163eaf034f7ae0b8debd0933767f7b
parenta0f4d6c75981728d1f90f69cba3e8d67c37641c6 (diff)
[PATCH] convert-cciss-to-compat_ioctl fix
Make the declaration match the definition.. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/block/cciss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 133dd2c44dc3..967c0f31edea 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -147,7 +147,7 @@ static void cciss_procinit(int i) {}
#endif /* CONFIG_PROC_FS */
#ifdef CONFIG_COMPAT
-static int cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
+static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
#endif
static struct block_device_operations cciss_fops = {