patch-2.4.10 linux/drivers/char/joystick/serport.c
Next file: linux/drivers/char/joystick/sidewinder.c
Previous file: linux/drivers/char/joystick/serio.c
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
Wed Sep 12 15:34:06 2001
- Orig file:
v2.4.9/linux/drivers/char/joystick/serport.c
- Orig date:
Fri Feb 9 11:30:23 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/char/joystick/serport.c linux/drivers/char/joystick/serport.c
@@ -1,7 +1,7 @@
/*
- * $Id: serport.c,v 1.4 2000/05/29 10:54:53 vojtech Exp $
+ * $Id: serport.c,v 1.7 2001/05/25 19:00:27 jdeneux Exp $
*
- * Copyright (c) 1999-2000 Vojtech Pavlik
+ * Copyright (c) 1999-2001 Vojtech Pavlik
*
* Sponsored by SuSE
*/
@@ -148,7 +148,11 @@
DECLARE_WAITQUEUE(wait, current);
char name[32];
+#ifdef CONFIG_DEVFS_FS
sprintf(name, tty->driver.name, MINOR(tty->device) - tty->driver.minor_start);
+#else
+ sprintf(name, "%s%d", tty->driver.name, MINOR(tty->device) - tty->driver.minor_start);
+#endif
serio_register_port(&serport->serio);
@@ -218,3 +222,5 @@
module_init(serport_init);
module_exit(serport_exit);
+
+MODULE_LICENSE("GPL");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)