From 03ba4131783cc9e872f8bb26a03f15bc11f27564 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 19 Sep 1998 19:15:08 +0000
Subject:  - Merge with Linux 2.1.121.  - Bugfixes.

---
 arch/sparc64/mm/asyncd.c       | 1 -
 arch/sparc64/solaris/socksys.c | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'arch/sparc64')

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 */
 };
 
-- 
cgit v1.2.3