Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=90b0c41829450d60da388edcd346c5b31371e7be
Commit:     90b0c41829450d60da388edcd346c5b31371e7be
Parent:     ccf9ea91aba0d3b8145900ec02f6edf03dda708c
Author:     Boaz Harrosh <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 6 15:38:33 2008 +0200
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Mon Feb 11 13:36:31 2008 -0600

    [SCSI] aic94xx: fix ABORT_TASK define conflict
    
    include/scsi/scsi.h as a definition:
    #define ABORT_TASK          0x0d
    
    on the other hand drivers/scsi/aic94xx/aic94xx_sas.h has:
    #define ABORT_TASK              0x03
    
    rename the latter to SCB_ABORT_TASK
    
    Signed-off-by: Boaz Harrosh <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/aic94xx/aic94xx_sas.h |    2 +-
 drivers/scsi/aic94xx/aic94xx_tmf.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/aic94xx/aic94xx_sas.h 
b/drivers/scsi/aic94xx/aic94xx_sas.h
index fa7c529..912e6b7 100644
--- a/drivers/scsi/aic94xx/aic94xx_sas.h
+++ b/drivers/scsi/aic94xx/aic94xx_sas.h
@@ -292,7 +292,7 @@ struct scb_header {
 #define INITIATE_SSP_TASK       0x00
 #define INITIATE_LONG_SSP_TASK  0x01
 #define INITIATE_BIDIR_SSP_TASK 0x02
-#define ABORT_TASK              0x03
+#define SCB_ABORT_TASK          0x03
 #define INITIATE_SSP_TMF        0x04
 #define SSP_TARG_GET_DATA       0x05
 #define SSP_TARG_GET_DATA_GOOD  0x06
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c 
b/drivers/scsi/aic94xx/aic94xx_tmf.c
index 87b2f6e..b52124f 100644
--- a/drivers/scsi/aic94xx/aic94xx_tmf.c
+++ b/drivers/scsi/aic94xx/aic94xx_tmf.c
@@ -369,7 +369,7 @@ int asd_abort_task(struct sas_task *task)
                return -ENOMEM;
        scb = ascb->scb;
 
-       scb->header.opcode = ABORT_TASK;
+       scb->header.opcode = SCB_ABORT_TASK;
 
        switch (task->task_proto) {
        case SAS_PROTOCOL_SATA:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to