[SCSI] zfcp: fix compile error
authorAndreas Herrmann <aherrman@de.ibm.com>
Thu, 21 Apr 2005 20:14:31 +0000 (16:14 -0400)
committerJames Bottomley <jejb@mulgrave.(none)>
Thu, 21 Apr 2005 20:14:31 +0000 (16:14 -0400)
Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/s390/scsi/zfcp_aux.c
drivers/s390/scsi/zfcp_def.h

index 1f9aeb4accc60cc80f810125083e860dbf74dc3f..68d151aaa4749f893294d4a04150f57c59b6f509 100644 (file)
@@ -52,7 +52,7 @@ static inline int zfcp_sg_list_copy_from_user(struct zfcp_sg_list *,
 static inline int zfcp_sg_list_copy_to_user(void __user *,
                                            struct zfcp_sg_list *, size_t);
 
-static int zfcp_cfdc_dev_ioctl(struct file *, unsigned int, unsigned long);
+static long zfcp_cfdc_dev_ioctl(struct file *, unsigned int, unsigned long);
 
 #define ZFCP_CFDC_IOC_MAGIC                     0xDD
 #define ZFCP_CFDC_IOC \
index 0afa1c4696ca6b5f7ae4c1356ad7b640f8c8b8cc..c5daf372f853d556c83abcf2ad475d65fda581b5 100644 (file)
@@ -61,7 +61,6 @@
 #include <linux/mempool.h>
 #include <linux/syscalls.h>
 #include <linux/ioctl.h>
-#include <linux/ioctl32.h>
 
 /************************ DEBUG FLAGS *****************************************/