diff --git a/[refs] b/[refs]
index 7695f75f30b4..7c0bc3ebf187 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9334c4c16e6fa80dc55865897337b49c1753f33b
+refs/heads/master: db55a0492d87c80d8d9a5cf330c58dee55757cba
diff --git a/trunk/drivers/usb/serial/oti6858.c b/trunk/drivers/usb/serial/oti6858.c
index 53f2768c9a36..5fdc33c6a3c0 100644
--- a/trunk/drivers/usb/serial/oti6858.c
+++ b/trunk/drivers/usb/serial/oti6858.c
@@ -958,20 +958,7 @@ static void oti6858_write_bulk_callback(struct urb *urb)
 	}
 }
 
-/* module description and (de)initialization */
-
-static int __init oti6858_init(void)
-{
-	return usb_serial_register_drivers(&oti6858_driver, serial_drivers);
-}
-
-static void __exit oti6858_exit(void)
-{
-	usb_serial_deregister_drivers(&oti6858_driver, serial_drivers);
-}
-
-module_init(oti6858_init);
-module_exit(oti6858_exit);
+module_usb_serial_driver(oti6858_driver, serial_drivers);
 
 MODULE_DESCRIPTION(OTI6858_DESCRIPTION);
 MODULE_AUTHOR(OTI6858_AUTHOR);