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

• Lines: 36
• Date: Fri Oct 9 12:30:15 1998
• Orig file: v2.1.125/linux/drivers/char/misc.c
• Orig date: Mon Sep 28 10:51:33 1998

diff -u --recursive --new-file v2.1.125/linux/drivers/char/misc.c linux/drivers/char/misc.c
@@ -66,7 +66,6 @@
 
 extern int adbdev_init(void);
 extern int bus_mouse_init(void);
-extern int psaux_init(void);
 extern int qpmouse_init(void);
 extern int ms_bus_mouse_init(void);
 extern int atixl_busmouse_init(void);
@@ -156,8 +155,13 @@
 	}
 	if (misc->minor < DYNAMIC_MINORS)
 		misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
-	misc->next = &misc_list;
-	misc->prev = misc_list.prev;
+
+	/*
+	 * Add it to the front, so that later devices can "override"
+	 * earlier defaults
+	 */
+	misc->prev = &misc_list;
+	misc->next = misc_list.next;
 	misc->prev->next = misc;
 	misc->next->prev = misc;
 	return 0;
@@ -199,10 +203,7 @@
 	bus_mouse_init();
 #endif
 #if defined CONFIG_82C710_MOUSE
-	qpmouse_init();		/* This must be before psaux_init */
-#endif
-#if defined CONFIG_PSMOUSE
-	psaux_init();
+	qpmouse_init();
 #endif
 #ifdef CONFIG_MS_BUSMOUSE
 	ms_bus_mouse_init();