ChangeSet 1.946.3.5, 2002/12/26 12:13:04-08:00, greg@kroah.com

[PATCH] USB: make the usbserial driver have the same name for the tty, usb, and module subsystems.


diff -Nru a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
--- a/drivers/usb/serial/usb-serial.c	Fri Dec 27 23:58:04 2002
+++ b/drivers/usb/serial/usb-serial.c	Fri Dec 27 23:58:04 2002
@@ -366,7 +366,7 @@
 
 /* Driver structure we register with the USB core */
 static struct usb_driver usb_serial_driver = {
-	.name =		"serial",
+	.name =		"usbserial",
 	.probe =	usb_serial_probe,
 	.disconnect =	usb_serial_disconnect,
 #ifdef CONFIG_USB_SERIAL_GENERIC
@@ -1259,7 +1259,7 @@
 
 struct tty_driver usb_serial_tty_driver = {
 	.magic =		TTY_DRIVER_MAGIC,
-	.driver_name =		"usb-serial",
+	.driver_name =		"usbserial",
 #ifndef CONFIG_DEVFS_FS
 	.name =			"ttyUSB",
 #else