vserver 1.9.3

[linux-2.6.git] / drivers / block / cciss.h

diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
index 825855c..8ab689c 100644 (file)
--- a/drivers/block/cciss.h
+++ b/drivers/block/cciss.h
@@ -43,12 +43,12 @@ struct ctlr_info
        char    firm_ver[4]; // Firmware version 
        struct pci_dev *pdev;
        __u32   board_id;
-       unsigned long vaddr;
+       void __iomem *vaddr;
        unsigned long paddr;
        unsigned long io_mem_addr;
        unsigned long io_mem_length;
-       CfgTable_struct *cfgtable;
-       int     intr;
+       CfgTable_struct __iomem *cfgtable;
+       unsigned int intr;
        int     interrupts_enabled;
        int     max_commands;
        int     commands_outstanding;