diff options
| author | Boaz Harrosh <bharrosh@panasas.com> | 2008-02-06 08:38:33 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-02-11 14:36:31 -0500 |
| commit | 90b0c41829450d60da388edcd346c5b31371e7be (patch) | |
| tree | b08aa6124d2dd44c13c922b2db5884e9d69fb052 /drivers/scsi/aic94xx/aic94xx_tmf.c | |
| parent | ccf9ea91aba0d3b8145900ec02f6edf03dda708c (diff) | |
[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 <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_tmf.c')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_tmf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c index 87b2f6e6adfe..b52124f3d3ac 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) | |||
| 369 | return -ENOMEM; | 369 | return -ENOMEM; |
| 370 | scb = ascb->scb; | 370 | scb = ascb->scb; |
| 371 | 371 | ||
| 372 | scb->header.opcode = ABORT_TASK; | 372 | scb->header.opcode = SCB_ABORT_TASK; |
| 373 | 373 | ||
| 374 | switch (task->task_proto) { | 374 | switch (task->task_proto) { |
| 375 | case SAS_PROTOCOL_SATA: | 375 | case SAS_PROTOCOL_SATA: |