Merge branch 'merge'

[pandora-kernel.git] / drivers / scsi / megaraid / mega_common.h

diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index 69df1a9..8cd0bd1 100644 (file)
--- 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>
@@ -38,6 +37,12 @@
 #define LSI_MAX_CHANNELS               16
 #define LSI_MAX_LOGICAL_DRIVES_64LD    (64+1)
 
+#define HBA_SIGNATURE_64_BIT           0x299
+#define PCI_CONF_AMISIG64              0xa4
+
+#define MEGA_SCSI_INQ_EVPD             1
+#define MEGA_INVALID_FIELD_IN_CDB      0x24
+
 
 /**
  * scb_t - scsi command control block
@@ -97,7 +102,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 +156,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;