Merge git://oss.sgi.com:8090/xfs/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / lpfc / lpfc_scsi.h

diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index cdcd2535803f2f7648df3e8e99b6161806f4b551..daba92374985e584d38e7e20513f36d8355bd924 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2005 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -110,7 +110,6 @@ struct fcp_cmnd {
 struct lpfc_scsi_buf {
        struct list_head list;
        struct scsi_cmnd *pCmd;
-       struct lpfc_hba *scsi_hba;
        struct lpfc_rport_data *rdata;
 
        uint32_t timeout;
@@ -139,6 +138,7 @@ struct lpfc_scsi_buf {
         * Iotag is in here
         */
        struct lpfc_iocbq cur_iocbq;
+       wait_queue_head_t *waitq;
 };
 
 #define LPFC_SCSI_DMA_EXT_SIZE 264