diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /arch/sparc64 | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/mm/asyncd.c | 1 | ||||
| -rw-r--r-- | arch/sparc64/solaris/socksys.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/mm/asyncd.c b/arch/sparc64/mm/asyncd.c index 9308e41fc..6dfaca524 100644 --- a/arch/sparc64/mm/asyncd.c +++ b/arch/sparc64/mm/asyncd.c @@ -11,7 +11,6 @@ #include <linux/mm.h> #include <linux/malloc.h> #include <linux/sched.h> -#include <linux/head.h> #include <linux/kernel.h> #include <linux/kernel_stat.h> #include <linux/errno.h> diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c index 523073a6d..dce7927d8 100644 --- a/arch/sparc64/solaris/socksys.c +++ b/arch/sparc64/solaris/socksys.c @@ -57,6 +57,7 @@ static struct file_operations socksys_file_ops = { NULL, /* ioctl */ NULL, /* mmap */ NULL, /* open */ + NULL, /* flush */ NULL, /* release */ }; @@ -170,6 +171,7 @@ static struct file_operations socksys_fops = { NULL, /* ioctl */ NULL, /* mmap */ socksys_open, /* open */ + NULL, /* flush */ socksys_release,/* release */ }; |