aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic94xx
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@suse.de>2010-07-27 16:51:13 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-07-28 10:07:49 -0400
commitdf64d3caab8db6ae17dacd229a03d7689a10c432 (patch)
tree247fe4f9f39b22186e42e7f4687dd62c2690e47b /drivers/scsi/aic94xx
parent653c42d552d0fd0b05485442aed45dd2d62269c0 (diff)
[SCSI] Unify SAM_ and SAM_STAT_ macros
We have two separate definitions for identical constants with nearly the same name. One comes from the generic headers in scsi.h; the other is an enum in libsas.h ... it's causing confusion about which one is correct (fortunately they both are). Fix this by eliminating the libsas.h duplicate Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/aic94xx')
-rw-r--r--drivers/scsi/aic94xx/aic94xx_task.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index 75d20f72501f..532d212b6b2c 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -223,7 +223,7 @@ Again:
223 switch (opcode) { 223 switch (opcode) {
224 case TC_NO_ERROR: 224 case TC_NO_ERROR:
225 ts->resp = SAS_TASK_COMPLETE; 225 ts->resp = SAS_TASK_COMPLETE;
226 ts->stat = SAM_GOOD; 226 ts->stat = SAM_STAT_GOOD;
227 break; 227 break;
228 case TC_UNDERRUN: 228 case TC_UNDERRUN:
229 ts->resp = SAS_TASK_COMPLETE; 229 ts->resp = SAS_TASK_COMPLETE;