diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /drivers/sound/via82cxxx_audio.c | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'drivers/sound/via82cxxx_audio.c')
| -rw-r--r-- | drivers/sound/via82cxxx_audio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/sound/via82cxxx_audio.c b/drivers/sound/via82cxxx_audio.c index 7470ffb03..f609d1e2b 100644 --- a/drivers/sound/via82cxxx_audio.c +++ b/drivers/sound/via82cxxx_audio.c @@ -1727,18 +1727,18 @@ static struct page * via_mm_nopage (struct vm_area_struct * vma, } -#ifndef VM_RESERVE +#ifndef VM_RESERVED static int via_mm_swapout (struct page *page, struct file *filp) { return 0; } -#endif /* VM_RESERVE */ +#endif /* VM_RESERVED */ struct vm_operations_struct via_mm_ops = { nopage: via_mm_nopage, -#ifndef VM_RESERVE +#ifndef VM_RESERVED swapout: via_mm_swapout, #endif }; @@ -1789,8 +1789,8 @@ static int via_dsp_mmap(struct file *file, struct vm_area_struct *vma) vma->vm_ops = &via_mm_ops; vma->vm_private_data = card; -#ifdef VM_RESERVE - vma->vm_flags |= VM_RESERVE; +#ifdef VM_RESERVED + vma->vm_flags |= VM_RESERVED; #endif if (rd) |