[PATCH] bcm43xx: preemptible periodic work

[safe/jmp/linux-2.6] / drivers / block / cciss.h

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 3b0858c..b24fc05 100644 (file)
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -13,8 +13,6 @@
 #define IO_OK          0
 #define IO_ERROR       1
 
-#define MAJOR_NR COMPAQ_CISS_MAJOR
-
 struct ctlr_info;
 typedef struct ctlr_info ctlr_info_t;
 
@@ -65,7 +63,6 @@ struct ctlr_info
        unsigned long io_mem_addr;
        unsigned long io_mem_length;
        CfgTable_struct __iomem *cfgtable;
-       unsigned int intr;
        int     interrupts_enabled;
        int     major;
        int     max_commands;
@@ -74,6 +71,13 @@ struct ctlr_info
        int     num_luns;
        int     highest_lun;
        int     usage_count;  /* number of opens all all minor devices */
+#      define DOORBELL_INT     0
+#      define PERF_MODE_INT    1
+#      define SIMPLE_MODE_INT  2
+#      define MEMQ_MODE_INT    3
+       unsigned int intr[4];
+       unsigned int msix_vector;
+       unsigned int msi_vector;
 
        // information about each logical volume
        drive_info_struct drv[CISS_MAX_LUN];