logi busmouse patch for 2.3.14

Ben Fennema (bfennema@falcon.csc.calpoly.edu)
Thu, 19 Aug 1999 22:33:44 -0700 (PDT)

This patch lets me compile the logitech busmouse driver into 2.3.13+ kernel.
Otherwise I get multiple definition of bus_mouse_init() error's

Ben

diff -u --recursive --new-file linux.old/linux/drivers/char/Makefile linux/drivers/char/Makefile
--- linux.old/linux/drivers/char/Makefile Thu Aug 5 14:47:44 1999
+++ linux/drivers/char/Makefile Wed Aug 18 23:23:55 1999
@@ -198,11 +198,11 @@
endif
endif

-ifeq ($(CONFIG_MOUSE),y)
+ifeq ($(CONFIG_BUSMOUSE),y)
M = y
OX_OBJS += busmouse.o
else
- ifeq ($(CONFIG_MOUSE),m)
+ ifeq ($(CONFIG_BUSMOUSE),m)
MM = m
MX_OBJS += busmouse.o
endif
diff -u --recursive --new-file linux.old/linux/drivers/char/busmouse.c linux/drivers/char/busmouse.c
--- linux.old/linux/drivers/char/busmouse.c Wed Aug 18 23:27:19 1999
+++ linux/drivers/char/busmouse.c Wed Aug 18 23:20:22 1999
@@ -49,7 +49,7 @@
/*#define BROKEN_MOUSE*/

extern int adb_mouse_init(void);
-extern int bus_mouse_init(void);
+extern int logi_busmouse_init(void);
extern int ms_bus_mouse_init(void);
extern int atixl_busmouse_init(void);
extern int amiga_mouse_init(void);
@@ -435,8 +435,8 @@
__initfunc(int
bus_mouse_init(void))
{
-#ifdef CONFIG_BUSMOUSE
- bus_mouse_init();
+#ifdef CONFIG_LOGIBUSMOUSE
+ logi_busmouse_init();
#endif
#ifdef CONFIG_MS_BUSMOUSE
ms_bus_mouse_init();
diff -u --recursive --new-file linux.old/linux/drivers/char/logibusmouse.c linux/drivers/char/logibusmouse.c
--- linux.old/linux/drivers/char/logibusmouse.c Mon Aug 2 09:54:29 1999
+++ linux/drivers/char/logibusmouse.c Tue Aug 17 22:10:33 1999
@@ -118,7 +118,7 @@
LOGITECH_BUSMOUSE, "busmouse", open_mouse, close_mouse, 7
};

-int __init bus_mouse_init(void)
+int __init logi_busmouse_init(void)
{
if (check_region(LOGIBM_BASE, LOGIBM_EXTENT))
return -EIO;
@@ -146,7 +146,7 @@

int init_module(void)
{
- return bus_mouse_init();
+ return logi_busmouse_init();
}

void cleanup_module(void)
diff -u --recursive --new-file linux.old/linux/drivers/char/misc.c linux/drivers/char/misc.c
--- linux.old/linux/drivers/char/misc.c Mon Aug 9 12:14:28 1999
+++ linux/drivers/char/misc.c Wed Aug 18 23:26:02 1999
@@ -187,7 +187,7 @@
proc_misc = create_proc_entry("misc", 0, 0);
if (proc_misc)
proc_misc->read_proc = misc_read_proc;
-#ifdef CONFIG_MOUSE
+#ifdef CONFIG_BUSMOUSE
bus_mouse_init();
#endif
#if defined CONFIG_82C710_MOUSE

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/