From b9558d5f86c471a125abf1fb3a3882fb053b1f8c Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 18 Feb 2000 00:24:27 +0000
Subject: Merge with Linux 2.3.41.

---
 drivers/sbus/char/Makefile  | 7 +++++++
 drivers/sbus/char/jsflash.c | 9 +++++++++
 drivers/sbus/char/uctrl.c   | 4 ++--
 drivers/sbus/char/vfc_i2c.c | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'drivers/sbus/char')

diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index 9a4a59fe6..4a88efda3 100644
--- a/drivers/sbus/char/Makefile
+++ b/drivers/sbus/char/Makefile
@@ -103,6 +103,13 @@ else
   endif
 endif
 
+ifeq ($(CONFIG_SUN_JSFLASH),y)
+O_OBJS += jsflash.o
+endif
+ifeq ($(CONFIG_SUN_JSFLASH),m)
+M_OBJS += jsflash.o
+endif
+
 include $(TOPDIR)/Rules.make
 
 sunkbdmap.o: sunkeymap.c
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index ab4ff4f90..14f074023 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -191,12 +191,21 @@ static ssize_t jsf_read(struct file * file, char * buf,
 	}
 
 	if (p < JSF_BASE_ALL && togo != 0) {
+#if 0 /* __bzero XXX */
 		size_t x = JSF_BASE_ALL - p;
 		if (x > togo) x = togo;
 		clear_user(tmp, x);
 		tmp += x;
 		p += x;
 		togo -= x;
+#else
+		/*
+		 * Implementation of clear_user() calls __bzero
+		 * without regard to modversions,
+		 * so we cannot build a module.
+		 */
+		return 0;
+#endif
 	}
 
 	while (togo >= 4) {
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index f46cffe1b..6d9decaf3 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -1,4 +1,4 @@
-/* $Id: uctrl.c,v 1.5 1999/12/15 15:48:24 davem Exp $
+/* $Id: uctrl.c,v 1.6 2000/01/22 05:22:07 anton Exp $
  * uctrl.c: TS102 Microcontroller interface on Tadpole Sparcbook 3
  *
  * Copyright 1999 Derrick J Brashear (shadow@dementia.org)
@@ -380,7 +380,7 @@ void uctrl_get_external_status()
 #ifdef MODULE
 int init_module(void)
 #else
-int __init uctrl_init(void)
+int __init ts102_uctrl_init(void)
 #endif
 {
 	struct uctrl_driver *driver = &drv;
diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c
index 2538c935f..6731caa78 100644
--- a/drivers/sbus/char/vfc_i2c.c
+++ b/drivers/sbus/char/vfc_i2c.c
@@ -115,7 +115,7 @@ int vfc_i2c_reset_bus(struct vfc_dev *dev)
 {
 	VFC_I2C_DEBUG_PRINTK((KERN_DEBUG "vfc%d: Resetting the i2c bus\n",
 			      dev->instance));
-	if(dev == NULl)
+	if(dev == NULL)
 		return -EINVAL;
 	if(dev->regs == NULL)
 		return -EINVAL;
-- 
cgit v1.2.3