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

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 133dd2c44dc3b2241e119694e31d3ddf935fa775..967c0f31edeade9a2986ccfeffe64ff3e1120db9 100644 (file)
--- 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  = {