diff --git a/[refs] b/[refs]
index 5fb295decb35..ab81214ea7e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 491c77a96689821bbe6acbef7dd1544bec35f794
+refs/heads/master: b99dab079445f5d586d4d9e0f81d3d07ecbf51f4
diff --git a/trunk/drivers/usb/serial/vivopay-serial.c b/trunk/drivers/usb/serial/vivopay-serial.c
index a6f113bd4fae..078f338b5feb 100644
--- a/trunk/drivers/usb/serial/vivopay-serial.c
+++ b/trunk/drivers/usb/serial/vivopay-serial.c
@@ -45,25 +45,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
 	&vivopay_serial_device, NULL
 };
 
-static int __init vivopay_serial_init(void)
-{
-	int retval;
-
-	retval = usb_serial_register_drivers(&vivopay_serial_driver,
-			serial_drivers);
-	if (retval == 0)
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-				DRIVER_DESC "\n");
-	return retval;
-}
-
-static void __exit vivopay_serial_exit(void)
-{
-	usb_serial_deregister_drivers(&vivopay_serial_driver, serial_drivers);
-}
-
-module_init(vivopay_serial_init);
-module_exit(vivopay_serial_exit);
+module_usb_serial_driver(vivopay_serial_driver, serial_drivers);
 
 MODULE_AUTHOR("Forest Bond <forest.bond@outpostembedded.com>");
 MODULE_DESCRIPTION(DRIVER_DESC);