diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-20 20:21:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-20 20:21:03 -0400 |
commit | 9636273dae265b9354b861b373cd43cd76a6d0fe (patch) | |
tree | cfdcf2133f1846c6f18e21f2a74fc267b8302c3b /drivers/scsi/aic7xxx/aiclib.c | |
parent | 2df9fa36643f03b0462b170515c1e221c3709fa9 (diff) | |
parent | 2bf2c568c878b9c0bbacac5c3210a6bd81856d21 (diff) |
Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
Diffstat (limited to 'drivers/scsi/aic7xxx/aiclib.c')
-rw-r--r-- | drivers/scsi/aic7xxx/aiclib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/aic7xxx/aiclib.c b/drivers/scsi/aic7xxx/aiclib.c index 79bfd9efd8ed..7c5a6db0e672 100644 --- a/drivers/scsi/aic7xxx/aiclib.c +++ b/drivers/scsi/aic7xxx/aiclib.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/version.h> | 35 | #include <linux/version.h> |
36 | 36 | ||
37 | /* Core SCSI definitions */ | 37 | /* Core SCSI definitions */ |
38 | #include "scsi.h" | ||
39 | #include <scsi/scsi_host.h> | 38 | #include <scsi/scsi_host.h> |
40 | #include "aiclib.h" | 39 | #include "aiclib.h" |
41 | #include "cam.h" | 40 | #include "cam.h" |