diff options
Diffstat (limited to 'drivers/block/cciss.h')
-rw-r--r-- | drivers/block/cciss.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h index 3b0858c83897..b24fc0553ccf 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h | |||
@@ -13,8 +13,6 @@ | |||
13 | #define IO_OK 0 | 13 | #define IO_OK 0 |
14 | #define IO_ERROR 1 | 14 | #define IO_ERROR 1 |
15 | 15 | ||
16 | #define MAJOR_NR COMPAQ_CISS_MAJOR | ||
17 | |||
18 | struct ctlr_info; | 16 | struct ctlr_info; |
19 | typedef struct ctlr_info ctlr_info_t; | 17 | typedef struct ctlr_info ctlr_info_t; |
20 | 18 | ||
@@ -65,7 +63,6 @@ struct ctlr_info | |||
65 | unsigned long io_mem_addr; | 63 | unsigned long io_mem_addr; |
66 | unsigned long io_mem_length; | 64 | unsigned long io_mem_length; |
67 | CfgTable_struct __iomem *cfgtable; | 65 | CfgTable_struct __iomem *cfgtable; |
68 | unsigned int intr; | ||
69 | int interrupts_enabled; | 66 | int interrupts_enabled; |
70 | int major; | 67 | int major; |
71 | int max_commands; | 68 | int max_commands; |
@@ -74,6 +71,13 @@ struct ctlr_info | |||
74 | int num_luns; | 71 | int num_luns; |
75 | int highest_lun; | 72 | int highest_lun; |
76 | int usage_count; /* number of opens all all minor devices */ | 73 | int usage_count; /* number of opens all all minor devices */ |
74 | # define DOORBELL_INT 0 | ||
75 | # define PERF_MODE_INT 1 | ||
76 | # define SIMPLE_MODE_INT 2 | ||
77 | # define MEMQ_MODE_INT 3 | ||
78 | unsigned int intr[4]; | ||
79 | unsigned int msix_vector; | ||
80 | unsigned int msi_vector; | ||
77 | 81 | ||
78 | // information about each logical volume | 82 | // information about each logical volume |
79 | drive_info_struct drv[CISS_MAX_LUN]; | 83 | drive_info_struct drv[CISS_MAX_LUN]; |