Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv16009/drivers/char
Modified Files:
tty_io.c
Log Message:
Merge with 2.5.48
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tty_io.c 15 Jun 2003 23:29:22 -0000 1.12
+++ tty_io.c 19 Jun 2003 23:31:47 -0000 1.13
@@ -2050,14 +2050,7 @@
void tty_unregister_devfs (struct tty_driver *driver, unsigned minor)
{
-#ifdef CONFIG_DEVFS_FS
- int idx = minor - driver->minor_start;
- char buf[32];
-
- sprintf(buf, driver->name, idx + driver->name_base);
- devfs_find_and_unregister(NULL, buf, driver->major, minor,
- DEVFS_SPECIAL_CHR, 0);
-#endif /* CONFIG_DEVFS_FS */
+ devfs_remove(driver->name, minor-driver->minor_start+driver->name_base);
}
EXPORT_SYMBOL(tty_register_devfs);
|