diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-06 19:46:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-06 19:46:40 -0400 |
| commit | 07342d623b8e1ac9501a36a0da55cbce1117aeaf (patch) | |
| tree | 611ac9c9a042ad5a5af247567091db9808ceb5ca /drivers/s390/scsi/zfcp_def.h | |
| parent | d4a1a7322c8c6b9899851f8358eb3842c67de6bc (diff) | |
| parent | e4862fedbc37a2c242824b100101f8e6e8488748 (diff) | |
Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
Diffstat (limited to 'drivers/s390/scsi/zfcp_def.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 0afa1c4696ca..c5daf372f853 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
| @@ -61,7 +61,6 @@ | |||
| 61 | #include <linux/mempool.h> | 61 | #include <linux/mempool.h> |
| 62 | #include <linux/syscalls.h> | 62 | #include <linux/syscalls.h> |
| 63 | #include <linux/ioctl.h> | 63 | #include <linux/ioctl.h> |
| 64 | #include <linux/ioctl32.h> | ||
| 65 | 64 | ||
| 66 | /************************ DEBUG FLAGS *****************************************/ | 65 | /************************ DEBUG FLAGS *****************************************/ |
| 67 | 66 | ||