diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:38:52 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:38:52 -0500 |
commit | 0da36b3467040908d3df6bc1f5b4d592a8b23b63 (patch) | |
tree | 4843991fa3a67d9e3cbdfd39eb50574ce8b82c6e /drivers/scsi/megaraid/mega_common.h | |
parent | 8006fdd6dc387abaa4b683bda4868c879fd76070 (diff) | |
parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/megaraid/mega_common.h')
-rw-r--r-- | drivers/scsi/megaraid/mega_common.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h index 69df1a9b935d..4675343228ad 100644 --- a/drivers/scsi/megaraid/mega_common.h +++ b/drivers/scsi/megaraid/mega_common.h @@ -25,7 +25,6 @@ #include <linux/delay.h> #include <linux/blkdev.h> #include <linux/list.h> -#include <linux/version.h> #include <linux/moduleparam.h> #include <linux/dma-mapping.h> #include <asm/semaphore.h> @@ -97,7 +96,6 @@ typedef struct { * @param dpc_h : tasklet handle * @param pdev : pci configuration pointer for kernel * @param host : pointer to host structure of mid-layer - * @param host_lock : pointer to appropriate lock * @param lock : synchronization lock for mid-layer and driver * @param quiescent : driver is quiescent for now. * @param outstanding_cmds : number of commands pending in the driver @@ -152,7 +150,6 @@ typedef struct { struct tasklet_struct dpc_h; struct pci_dev *pdev; struct Scsi_Host *host; - spinlock_t *host_lock; spinlock_t lock; uint8_t quiescent; int outstanding_cmds; |