diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/cpqfcTStrigger.h | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
Merge by Hand
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/cpqfcTStrigger.h')
| -rw-r--r-- | drivers/scsi/cpqfcTStrigger.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/scsi/cpqfcTStrigger.h b/drivers/scsi/cpqfcTStrigger.h deleted file mode 100644 index c961792e6be0..000000000000 --- a/drivers/scsi/cpqfcTStrigger.h +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | // don't do this unless you have the right hardware! | ||
| 2 | #define TRIGGERABLE_HBA 0 | ||
| 3 | #if TRIGGERABLE_HBA | ||
| 4 | void TriggerHBA( void*, int); | ||
| 5 | #else | ||
| 6 | #define TriggerHBA(x, y) | ||
| 7 | #endif | ||
| 8 | |||