Merge ../scsi-rc-fixes-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / megaraid / mega_common.h

diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h
index 12e38125b1237e55fff927ba248bb8192cc5fb41..b50e27e660244ebf6e11a79adb8543557981742b 100644 (file)
--- a/drivers/scsi/megaraid/mega_common.h
+++ b/drivers/scsi/megaraid/mega_common.h
@@ -40,6 +40,9 @@
 #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
@@ -172,7 +175,7 @@ typedef struct {
        uint8_t                 max_lun;
 
        uint32_t                unique_id;
-       uint8_t                 irq;
+       int                     irq;
        uint8_t                 ito;
        caddr_t                 ibuf;
        dma_addr_t              ibuf_dma_h;