]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] aic94xx: fix ABORT_TASK define conflict
authorBoaz Harrosh <bharrosh@panasas.com>
Wed, 6 Feb 2008 13:38:33 +0000 (15:38 +0200)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Mon, 11 Feb 2008 19:36:31 +0000 (13:36 -0600)
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 <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/aic94xx/aic94xx_sas.h
drivers/scsi/aic94xx/aic94xx_tmf.c

index fa7c5290257d708f52ba5b1053bd3d8412c2a21b..912e6b755f74971c82a5a867cafbddd217e6f85b 100644 (file)
@@ -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
index 87b2f6e6adfef417b346014ba7c566ea4a4a6e10..b52124f3d3ac41dd704aab1a2a2d7895ce3cfc3d 100644 (file)
@@ -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: