patch-2.1.129 linux/drivers/char/misc.c

• Lines: 40
• Date: Mon Nov 16 10:32:58 1998
• Orig file: v2.1.128/linux/drivers/char/misc.c
• Orig date: Fri Oct 23 22:01:20 1998

diff -u --recursive --new-file v2.1.128/linux/drivers/char/misc.c linux/drivers/char/misc.c
@@ -64,14 +64,12 @@
 #define DYNAMIC_MINORS 64 /* like dynamic majors */
 static unsigned char misc_minors[DYNAMIC_MINORS / 8];
 
-extern int adbdev_init(void);
 extern int bus_mouse_init(void);
 extern int qpmouse_init(void);
 extern int ms_bus_mouse_init(void);
 extern int atixl_busmouse_init(void);
 extern int amiga_mouse_init(void);
 extern int atari_mouse_init(void);
-extern int mac_mouse_init(void);
 extern int sun_mouse_init(void);
 extern int adb_mouse_init(void);
 extern void watchdog_init(void);
@@ -196,9 +194,6 @@
 	if (proc_misc)
 		proc_misc->read_proc = misc_read_proc;
 #endif /* PROC_FS */
-#ifdef CONFIG_MAC
-	adbdev_init();
-#endif
 #ifdef CONFIG_BUSMOUSE
 	bus_mouse_init();
 #endif
@@ -217,13 +212,10 @@
 #ifdef CONFIG_ATARIMOUSE
 	atari_mouse_init();
 #endif
-#ifdef CONFIG_MACMOUSE
-	mac_mouse_init();
-#endif
 #ifdef CONFIG_SUN_MOUSE
 	sun_mouse_init();
 #endif
-#ifdef CONFIG_MACMOUSE
+#ifdef CONFIG_ADBMOUSE
 	adb_mouse_init();
 #endif
 #ifdef CONFIG_PC110_PAD