git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ccf9ea9) | patch
[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)
commit90b0c41829450d60da388edcd346c5b31371e7be
treeb08aa6124d2dd44c13c922b2db5884e9d69fb052tree | snapshot
parentccf9ea91aba0d3b8145900ec02f6edf03dda708ccommit | 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>
drivers/scsi/aic94xx/aic94xx_sas.h diff | blob | history
drivers/scsi/aic94xx/aic94xx_tmf.c diff | blob | history
Full containers within linux kernel