diff options
| -rw-r--r-- | drivers/scsi/sgiwd93.c | 6 | ||||
| -rw-r--r-- | drivers/scsi/wd33c93.c | 2 | ||||
| -rw-r--r-- | drivers/sgi/char/shmiq.c | 5 | ||||
| -rw-r--r-- | drivers/video/newport_con.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index a1ab378cd..5a475aa9a 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c @@ -234,7 +234,7 @@ static void dma_stop(struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, #endif } -void sgiwd93_reset(uchar *base) +void sgiwd93_reset(unsigned long base) { struct hpc3_scsiregs *hregs = (struct hpc3_scsiregs *) base; @@ -275,7 +275,7 @@ int __init sgiwd93_detect(Scsi_Host_Template *SGIblows) 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 @@ int __init sgiwd93_detect(Scsi_Host_Template *SGIblows) /* 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); diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c index 4f351e7aa..9d6d45e03 100644 --- a/drivers/scsi/wd33c93.c +++ b/drivers/scsi/wd33c93.c @@ -1367,7 +1367,7 @@ uchar sr; #ifdef CONFIG_SGI_IP22 { int busycount = 0; -extern void sgiwd93_reset(uchar*); +extern void sgiwd93_reset(unsigned long); /* wait 'til the chip gets some time for us */ while (READ_AUX_STAT() & ASR_BSY && busycount++ < 100) diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c index 5df43bf8b..03eab91e2 100644 --- a/drivers/sgi/char/shmiq.c +++ b/drivers/sgi/char/shmiq.c @@ -56,6 +56,7 @@ #include <linux/devfs_fs_kernel.h> #include <asm/shmiq.h> +#include <asm/gfx.h> #include <asm/mman.h> #include <asm/uaccess.h> #include <asm/poll.h> @@ -300,12 +301,12 @@ qcntl_ioctl (struct inode *inode, struct file *filp, unsigned int cmd, unsigned return -EINVAL; } -unsigned long +struct page * shmiq_nopage (struct vm_area_struct *vma, unsigned long address, int write_access) { /* Do not allow for mremap to expand us */ - return 0; + return NULL; } static struct vm_operations_struct qcntl_mmap = { diff --git a/drivers/video/newport_con.c b/drivers/video/newport_con.c index 3d461df5d..f1c67a43d 100644 --- a/drivers/video/newport_con.c +++ b/drivers/video/newport_con.c @@ -467,7 +467,7 @@ static int newport_scroll(struct vc_data *vc, int t, int b, int dir, int lines) { int count,x,y; unsigned short *s, *d; - unsigned short chattr; + unsigned short chattr = 0; logo_active = 0; /* it's time to disable the logo now.. */ |