diff --git a/[refs] b/[refs]
index f3de2045c365..33bb399b706b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6384eaefd337b465417e9b64ebf74717703c0788
+refs/heads/master: e206b7f831da365a38b22f72ba42db288db71c65
diff --git a/trunk/drivers/usb/serial/opticon.c b/trunk/drivers/usb/serial/opticon.c
index 7001ad779b94..82cc9d202b83 100644
--- a/trunk/drivers/usb/serial/opticon.c
+++ b/trunk/drivers/usb/serial/opticon.c
@@ -631,18 +631,8 @@ static struct usb_serial_driver * const serial_drivers[] = {
 	&opticon_device, NULL
 };
 
-static int __init opticon_init(void)
-{
-	return usb_serial_register_drivers(&opticon_driver, serial_drivers);
-}
-
-static void __exit opticon_exit(void)
-{
-	usb_serial_deregister_drivers(&opticon_driver, serial_drivers);
-}
+module_usb_serial_driver(opticon_driver, serial_drivers);
 
-module_init(opticon_init);
-module_exit(opticon_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");