diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-09 16:44:53 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-09 16:44:53 -0700 |
| commit | a84f5770170232a48e753e02ee5f0f17ee17b791 (patch) | |
| tree | 4efbd8a990df4437fb178c8a705dadc36812f98a /drivers/s390 | |
| parent | 66302f211a21bb9439a2ae7f7b6a4c386bb10ecd (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
Merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/scsi/zfcp_aux.c | 2 | ||||
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 1f9aeb4accc..68d151aaa47 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c @@ -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 \ diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 0afa1c4696c..c5daf372f85 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h @@ -61,7 +61,6 @@ #include <linux/mempool.h> #include <linux/syscalls.h> #include <linux/ioctl.h> -#include <linux/ioctl32.h> /************************ DEBUG FLAGS *****************************************/ |