- Merge with Linux 2.1.121.

 - Bugfixes.

10 files changed, 10 insertions, 0 deletions

diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c
index ab14e2767..c98923da4 100644
--- a/drivers/sbus/audio/audio.c
+++ b/drivers/sbus/audio/audio.c
@@ -881,6 +881,7 @@ static struct file_operations sparcaudioctl_fops = {
 	sparcaudio_ioctl,
 	NULL,			/* sparcaudio_mmap */
 	NULL,
+	NULL,			/* flush */
 	sparcaudioctl_release
 };
 
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 983e3893f..846f7cd7b 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -866,6 +866,7 @@ static struct file_operations bpp_fops = {
 	bpp_ioctl,
 	NULL,		/* bpp_mmap */
 	bpp_open,
+	NULL,		/* flush */
 	bpp_release,
 };
 
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index b957ce81c..af8f6ce78 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -298,6 +298,7 @@ static struct file_operations envctrl_fops = {
 	envctrl_ioctl,
 	NULL,		/* mmap */
 	envctrl_open,
+	NULL,		/* flush */
 	envctrl_release
 };
 
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 0a09e07e2..fd91eeefd 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -143,6 +143,7 @@ static struct file_operations flash_fops = {
 	NULL,		/* ioctl */
 	flash_mmap,
 	flash_open,
+	NULL,		/* flush */
 	flash_release
 };
 
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 6d09bfca4..7d17e08ea 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -564,6 +564,7 @@ static struct file_operations openprom_fops = {
 	openprom_ioctl,
 	NULL,			/* openprom_mmap */
 	openprom_open,
+	NULL,			/* flush */
 	openprom_release
 };
 
diff --git a/drivers/sbus/char/pcikbd.c b/drivers/sbus/char/pcikbd.c
index 06140fa68..d6be1fca0 100644
--- a/drivers/sbus/char/pcikbd.c
+++ b/drivers/sbus/char/pcikbd.c
@@ -869,6 +869,7 @@ struct file_operations psaux_fops = {
 	NULL, 		/* ioctl */
 	NULL,		/* mmap */
 	aux_open,
+	NULL,		/* flush */
 	aux_release,
 	NULL,
 	aux_fasync,
diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c
index f506a7c90..8e001c0bd 100644
--- a/drivers/sbus/char/rtc.c
+++ b/drivers/sbus/char/rtc.c
@@ -133,6 +133,7 @@ static struct file_operations rtc_fops = {
 	rtc_ioctl,
 	NULL,		/* rtc_mmap */
 	rtc_open,
+	NULL,		/* flush */
 	rtc_release
 };
 
diff --git a/drivers/sbus/char/sunkbd.c b/drivers/sbus/char/sunkbd.c
index 63586750e..59b77a5e4 100644
--- a/drivers/sbus/char/sunkbd.c
+++ b/drivers/sbus/char/sunkbd.c
@@ -1494,6 +1494,7 @@ file_operations kbd_fops =
 	kbd_ioctl,		/* ioctl */
 	NULL,			/* mmap */
 	kbd_open,		/* open */
+	NULL,			/* flush */
 	kbd_close,		/* close */
 	NULL,			/* fsync */
 	kbd_fasync,		/* fasync */
diff --git a/drivers/sbus/char/sunmouse.c b/drivers/sbus/char/sunmouse.c
index 70edaab36..3a6d672fb 100644
--- a/drivers/sbus/char/sunmouse.c
+++ b/drivers/sbus/char/sunmouse.c
@@ -474,6 +474,7 @@ struct file_operations sun_mouse_fops = {
 	sun_mouse_ioctl,
 	NULL,
 	sun_mouse_open,
+	NULL,		/* flush */
 	sun_mouse_close,
 	NULL,
 	sun_mouse_fasync,
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 81a8b7477..b16581679 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -603,6 +603,7 @@ static struct file_operations vfc_fops = {
 	vfc_ioctl,   
 	vfc_mmap, 
 	vfc_open,
+	NULL,		/* flush */
 	vfc_release,
 };