diff --git a/[refs] b/[refs]
index ab81214ea7e5..5b189bd34f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b99dab079445f5d586d4d9e0f81d3d07ecbf51f4
+refs/heads/master: 421f38835fe677d8c2e8c25628ae9cd4019653d2
diff --git a/trunk/drivers/usb/serial/whiteheat.c b/trunk/drivers/usb/serial/whiteheat.c
index a29be37a3a67..407e23c87946 100644
--- a/trunk/drivers/usb/serial/whiteheat.c
+++ b/trunk/drivers/usb/serial/whiteheat.c
@@ -1454,30 +1454,7 @@ static void rx_data_softint(struct work_struct *work)
 	tty_kref_put(tty);
 }
 
-
-/*****************************************************************************
- * Connect Tech's White Heat module functions
- *****************************************************************************/
-static int __init whiteheat_init(void)
-{
-	int retval;
-
-	retval = usb_serial_register_drivers(&whiteheat_driver, serial_drivers);
-	if (retval == 0)
-		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-				DRIVER_DESC "\n");
-	return retval;
-}
-
-
-static void __exit whiteheat_exit(void)
-{
-	usb_serial_deregister_drivers(&whiteheat_driver, serial_drivers);
-}
-
-
-module_init(whiteheat_init);
-module_exit(whiteheat_exit);
+module_usb_serial_driver(whiteheat_driver, serial_drivers);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);