diff options
author | Boaz Harrosh <bharrosh@panasas.com> | 2007-10-16 04:25:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 13:01:50 -0400 |
commit | e744fdea546abf7a794898a99a26f85c63a83648 (patch) | |
tree | 310f9d3484b1f201b9493d0cc801178769a487e1 /drivers/scsi | |
parent | a56daeb7d5c9a05b1cb52ae4bcca05fb6545656e (diff) |
scsi_mac.h: Define AUTOSENSE before include of NCR5380.h
- Previese patch to NCR5380 broke scsi_mac because
AUTOSENSE was defined after the inclusion of
NCR5380.h. Fix it
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/mac_scsi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index cdbcaa5ad6cf..abe2bda6ac37 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c | |||
@@ -53,6 +53,11 @@ | |||
53 | #include "scsi.h" | 53 | #include "scsi.h" |
54 | #include <scsi/scsi_host.h> | 54 | #include <scsi/scsi_host.h> |
55 | #include "mac_scsi.h" | 55 | #include "mac_scsi.h" |
56 | |||
57 | /* These control the behaviour of the generic 5380 core */ | ||
58 | #define AUTOSENSE | ||
59 | #define PSEUDO_DMA | ||
60 | |||
56 | #include "NCR5380.h" | 61 | #include "NCR5380.h" |
57 | 62 | ||
58 | #if 0 | 63 | #if 0 |
@@ -571,10 +576,6 @@ static int macscsi_pwrite (struct Scsi_Host *instance, | |||
571 | } | 576 | } |
572 | 577 | ||
573 | 578 | ||
574 | /* These control the behaviour of the generic 5380 core */ | ||
575 | #define AUTOSENSE | ||
576 | #define PSEUDO_DMA | ||
577 | |||
578 | #include "NCR5380.c" | 579 | #include "NCR5380.c" |
579 | 580 | ||
580 | static struct scsi_host_template driver_template = { | 581 | static struct scsi_host_template driver_template = { |