patch-2.3.10 linux/drivers/char/adbmouse.c

• Lines: 36
• Date: Tue Jul 6 19:16:55 1999
• Orig file: v2.3.9/linux/drivers/char/adbmouse.c
• Orig date: Mon Jun 7 12:12:22 1999

diff -u --recursive --new-file v2.3.9/linux/drivers/char/adbmouse.c linux/drivers/char/adbmouse.c
@@ -38,9 +38,7 @@
 #ifdef __powerpc__
 #include <asm/processor.h>
 #endif
-#ifdef __mc68000__
 #include <asm/setup.h>
-#endif
 
 static struct mouse_status mouse;
 static unsigned char adb_mouse_buttons[16];
@@ -244,7 +242,7 @@
     ADB_MOUSE_MINOR, "adbmouse", &adb_mouse_fops
 };
 
-__initfunc(int adb_mouse_init(void))
+int __init adb_mouse_init(void)
 {
     mouse.active = 0;
     mouse.ready = 0;
@@ -270,7 +268,7 @@
  * option, which is about using ADB keyboard buttons to emulate
  * mouse buttons. -- paulus
  */
-__initfunc(void adb_mouse_setup(char *str, int *ints))
+void __init adb_mouse_setup(char *str, int *ints)
 {
 	if (ints[0] >= 1) {
 		adb_emulate_buttons = ints[1] > 0;
@@ -282,7 +280,6 @@
 }
 
 #ifdef MODULE
-#include <asm/setup.h>
 
 int init_module(void)
 {