patch-2.4.0-test9 linux/drivers/block/cpqarray.h

Next file: linux/drivers/block/floppy.c
Previous file: linux/drivers/block/cpqarray.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/block/cpqarray.h linux/drivers/block/cpqarray.h
@@ -87,12 +87,13 @@
 	int	log_drives;
 	int	phys_drives;
 
+	struct pci_dev *pci_dev;    /* NULL if EISA */
 	__u32	board_id;
 	char	*product_name;	
 
-	__u32	vaddr;
-	__u32	paddr;
-	__u32	ioaddr;
+	void *vaddr;
+	unsigned long paddr;
+	unsigned long ioaddr;
 	int	intr;
 	int	usage_count;
 	drv_info_t	drv[NWD];

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)