patch-2.4.0-test4 linux/drivers/scsi/sgiwd93.c

Next file: linux/drivers/scsi/sgiwd93.h
Previous file: linux/drivers/scsi/sg.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test3/linux/drivers/scsi/sgiwd93.c linux/drivers/scsi/sgiwd93.c
@@ -7,7 +7,7 @@
  * 
  * (In all truth, Jed Schimmel wrote all this code.)
  *
- * $Id: sgiwd93.c,v 1.20 2000/02/21 15:05:48 ralf Exp $
+ * $Id: sgiwd93.c,v 1.19 2000/02/04 07:40:47 ralf Exp $
  */
 #include <linux/init.h>
 #include <linux/types.h>
@@ -234,7 +234,7 @@
 #endif
 }
 
-void sgiwd93_reset(uchar *base)
+void sgiwd93_reset(unsigned long base)
 {
 	struct hpc3_scsiregs *hregs = (struct hpc3_scsiregs *) base;
 
@@ -275,7 +275,7 @@
 	SGIblows->proc_name = "SGIWD93";
 
 	sgiwd93_host = scsi_register(SGIblows, sizeof(struct WD33C93_hostdata));
-	sgiwd93_host->base = (unsigned char *) hregs;
+	sgiwd93_host->base = (unsigned long) hregs;
 	sgiwd93_host->irq = SGI_WD93_0_IRQ;
 
 	buf = (uchar *) get_free_page(GFP_KERNEL);
@@ -294,7 +294,7 @@
         /* set up second controller on the Indigo2 */
 	if(!sgi_guiness) {
 		sgiwd93_host1 = scsi_register(SGIblows, sizeof(struct WD33C93_hostdata));
-		sgiwd93_host1->base = (unsigned char *) hregs1;
+		sgiwd93_host1->base = (unsigned long) hregs1;
 		sgiwd93_host1->irq = SGI_WD93_1_IRQ;
 
 		buf = (uchar *) get_free_page(GFP_KERNEL);

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