X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fipr.h;h=e91afc446a04f151c2726140c883379c03934898;hb=3ec04f3d2903fdf6d9849a8633af59b8628164a5;hp=1a5f2479869c15490badf527d3039248e2cb5b51;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 1a5f24798..e91afc446 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -749,7 +749,7 @@ struct ipr_misc_cbs {
 	struct ipr_supported_device supp_dev;
 };
 
-struct ipr_interrupt_offsets {
+struct ipr_interrupts {
 	unsigned long set_interrupt_mask_reg;
 	unsigned long clr_interrupt_mask_reg;
 	unsigned long sense_interrupt_mask_reg;
@@ -762,23 +762,10 @@ struct ipr_interrupt_offsets {
 	unsigned long clr_uproc_interrupt_reg;
 };
 
-struct ipr_interrupts {
-	void __iomem *set_interrupt_mask_reg;
-	void __iomem *clr_interrupt_mask_reg;
-	void __iomem *sense_interrupt_mask_reg;
-	void __iomem *clr_interrupt_reg;
-
-	void __iomem *sense_interrupt_reg;
-	void __iomem *ioarrin_reg;
-	void __iomem *sense_uproc_interrupt_reg;
-	void __iomem *set_uproc_interrupt_reg;
-	void __iomem *clr_uproc_interrupt_reg;
-};
-
 struct ipr_chip_cfg_t {
 	u32 mailbox;
 	u8 cache_line_size;
-	struct ipr_interrupt_offsets regs;
+	struct ipr_interrupts regs;
 };
 
 enum ipr_shutdown_type {
@@ -897,11 +884,12 @@ struct ipr_ioa_cfg {
 
 	const struct ipr_chip_cfg_t *chip_cfg;
 
-	void __iomem *hdw_dma_regs;	/* iomapped PCI memory space */
+	unsigned long hdw_dma_regs;	/* iomapped PCI memory space */
 	unsigned long hdw_dma_regs_pci;	/* raw PCI memory space */
-	void __iomem *ioa_mailbox;
+	unsigned long ioa_mailbox;
 	struct ipr_interrupts regs;
 
+	u32 pci_cfg_buf[64];
 	u16 saved_pcix_cmd_reg;
 	u16 reset_retries;