diff options
Diffstat (limited to 'drivers/sgi')
| -rw-r--r-- | drivers/sgi/.cvsignore | 1 | ||||
| -rw-r--r-- | drivers/sgi/char/.cvsignore | 1 | ||||
| -rw-r--r-- | drivers/sgi/char/graphics.c | 2 | ||||
| -rw-r--r-- | drivers/sgi/char/newport.c | 1 | ||||
| -rw-r--r-- | drivers/sgi/char/sgiserial.c | 1 | ||||
| -rw-r--r-- | drivers/sgi/char/shmiq.c | 2 |
6 files changed, 5 insertions, 3 deletions
diff --git a/drivers/sgi/.cvsignore b/drivers/sgi/.cvsignore index 4671378ae..857dd22e9 100644 --- a/drivers/sgi/.cvsignore +++ b/drivers/sgi/.cvsignore @@ -1 +1,2 @@ .depend +.*.flags diff --git a/drivers/sgi/char/.cvsignore b/drivers/sgi/char/.cvsignore index 4671378ae..857dd22e9 100644 --- a/drivers/sgi/char/.cvsignore +++ b/drivers/sgi/char/.cvsignore @@ -1 +1,2 @@ .depend +.*.flags diff --git a/drivers/sgi/char/graphics.c b/drivers/sgi/char/graphics.c index 6dff314e7..663d124fa 100644 --- a/drivers/sgi/char/graphics.c +++ b/drivers/sgi/char/graphics.c @@ -252,7 +252,7 @@ sgi_graphics_mmap (struct inode *inode, struct file *file, struct vm_area_struct vma->vm_page_prot = PAGE_USERIO; /* final setup */ - vma->vm_dentry = dget (file->f_dentry); + vma->vm_file = file; return 0; } diff --git a/drivers/sgi/char/newport.c b/drivers/sgi/char/newport.c index 756aec709..32b555480 100644 --- a/drivers/sgi/char/newport.c +++ b/drivers/sgi/char/newport.c @@ -167,7 +167,6 @@ newport_ioctl (int card, int cmd, unsigned long arg) { switch (cmd){ case NG1_SETDISPLAYMODE: { - int i; struct ng1_setdisplaymode_args request; if (copy_from_user (&request, (void *) arg, sizeof (request))) diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c index c8d4d7e54..e377d3241 100644 --- a/drivers/sgi/char/sgiserial.c +++ b/drivers/sgi/char/sgiserial.c @@ -3,6 +3,7 @@ * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) */ +#include <linux/config.h> /* for CONFIG_REMOTE_DEBUG */ #include <linux/errno.h> #include <linux/signal.h> #include <linux/sched.h> diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c index 37a8b9bf9..9c8bfc4dd 100644 --- a/drivers/sgi/char/shmiq.c +++ b/drivers/sgi/char/shmiq.c @@ -366,7 +366,7 @@ shmiq_qcntl_poll (struct file *filp, poll_table *wait) if (!shmiqs [minor].mapped) return 0; - poll_wait (&shmiqs [minor].proc_list, wait); + poll_wait (filp, &shmiqs [minor].proc_list, wait); s = shmiqs [minor].shmiq_vaddr; if (s->head != s->tail) return POLLIN | POLLRDNORM; |