aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/aic94xx/aic94xx_sas.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 11:48:01 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 11:48:01 -0800
commitd0cac32fa551b0e7dc1f014607eabb93b0ebbbe8 (patch)
treed6abb3575e8e7026d132aa1f17a48b557bc0b9de /drivers/scsi/aic94xx/aic94xx_sas.h
parent626db29f31ce253726411182ff6c15e31efe2e9a (diff)
parent05052f7f130b1232faeee1674a5bc41f67746cff (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] psi240i.c: fix an array overrun [SCSI] gdth: Fix && typos [SCSI] iscsi class: update version [SCSI] iscsi_tcp: fix xmittask oops [SCSI] iscsi: add newlines to debug messages [SCSI] iscsi: always release crypto [SCSI] sg: fix incorrect last scatg length [SCSI] 3ware 9000 add support for 9650SE [SCSI] aic94xx SCSI timeout fix: SMP retry fix. [SCSI] aic94xx SCSI timeout fix
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_sas.h')
-rw-r--r--drivers/scsi/aic94xx/aic94xx_sas.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_sas.h b/drivers/scsi/aic94xx/aic94xx_sas.h
index 64d23171234..9050e93bfd5 100644
--- a/drivers/scsi/aic94xx/aic94xx_sas.h
+++ b/drivers/scsi/aic94xx/aic94xx_sas.h
@@ -733,6 +733,7 @@ struct asd_phy {
struct sas_identify_frame *identify_frame;
struct asd_dma_tok *id_frm_tok;
+ struct asd_port *asd_port;
u8 frame_rcvd[ASD_EDB_SIZE];
};