From: Boaz Harrosh Date: Tue, 16 Oct 2007 08:25:01 +0000 (+0200) Subject: scsi_mac.h: Define AUTOSENSE before include of NCR5380.h X-Git-Tag: v2.6.24-rc1~841 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e744fdea546abf7a794898a99a26f85c63a83648;p=karo-tx-linux.git 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 Signed-off-by: Linus Torvalds --- 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 @@ #include "scsi.h" #include #include "mac_scsi.h" + +/* These control the behaviour of the generic 5380 core */ +#define AUTOSENSE +#define PSEUDO_DMA + #include "NCR5380.h" #if 0 @@ -571,10 +576,6 @@ static int macscsi_pwrite (struct Scsi_Host *instance, } -/* These control the behaviour of the generic 5380 core */ -#define AUTOSENSE -#define PSEUDO_DMA - #include "NCR5380.c" static struct scsi_host_template driver_template = {