patch-2.3.26 linux/drivers/char/msbusmouse.c

• Lines: 48
• Date: Tue Nov 2 21:38:44 1999
• Orig file: v2.3.25/linux/drivers/char/msbusmouse.c
• Orig date: Tue Aug 31 17:29:13 1999

diff -u --recursive --new-file v2.3.25/linux/drivers/char/msbusmouse.c linux/drivers/char/msbusmouse.c
@@ -56,16 +56,26 @@
 static int msedev;
 static int mouse_irq = MOUSE_IRQ;
 
-#ifdef MODULE
 MODULE_PARM(mouse_irq, "i");
-#endif
 
-void __init msmouse_setup(char *str, int *ints)
+#ifndef MODULE
+
+static int __init msmouse_setup(char *str)
 {
+        int ints[4];
+
+        str = get_options(str, ARRAY_SIZE(ints), ints);
+
 	if (ints[0] > 0)
 		mouse_irq=ints[1];
+
+	return 1;
 }
 
+__setup("msmouse=",msmouse_setup);
+
+#endif /* !MODULE */
+
 static void ms_mouse_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
         char dx, dy;
@@ -117,7 +127,7 @@
 	MICROSOFT_BUSMOUSE, "msbusmouse", open_mouse, release_mouse, 0
 };
 
-int __init ms_bus_mouse_init(void)
+static int __init ms_bus_mouse_init(void)
 {
 	int present = 0;
 	int mse_byte, i;
@@ -151,7 +161,7 @@
 	return msedev < 0 ? msedev : 0;
 }
 
-void ms_bus_mouse_exit(void)
+static void __exit ms_bus_mouse_exit(void)
 {
 	unregister_busmouse(msedev);
 	release_region(MS_MSE_CONTROL_PORT, 0x04);