Merge with 2.3.48.

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/acm.c b/drivers/usb/acm.c
index cc03acb09..d93391340 100644
--- a/drivers/usb/acm.c
+++ b/drivers/usb/acm.c
@@ -643,16 +643,10 @@ static struct tty_driver acm_tty_driver = {
 };
 
 /*
- * Init / cleanup.
+ * Init / exit.
  */
 
-static void __exit usb_acm_cleanup(void)
-{
-	usb_deregister(&acm_driver);
-	tty_unregister_driver(&acm_tty_driver);
-}
-
-static int __init usb_acm_init(void)
+static int __init acm_init(void)
 {
 	acm_tty_driver.init_termios =		tty_std_termios;
 	acm_tty_driver.init_termios.c_cflag =	B9600 | CS8 | CREAD | HUPCL | CLOCAL;
@@ -668,5 +662,11 @@ static int __init usb_acm_init(void)
 	return 0;
 }
 
-module_init(usb_acm_init);
-module_exit(usb_acm_cleanup);
+static void __exit acm_exit(void)
+{
+	usb_deregister(&acm_driver);
+	tty_unregister_driver(&acm_tty_driver);
+}
+
+module_init(acm_init);
+module_exit(acm_exit);