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

• Lines: 36
• Date: Mon Jul 12 16:21:25 1999
• Orig file: v2.3.10/linux/drivers/char/adbmouse.c
• Orig date: Thu Jul 8 15:42:20 1999

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