diff --git a/[refs] b/[refs]
index 434eea9cd0c7..b94b09fe3df8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15a89dc83bad5c22a02bd292cf87d72dacb7dcb3
+refs/heads/master: 4a6313644c3188f4aa1a6b4403896375baa2e09a
diff --git a/trunk/drivers/staging/line6/driver.c b/trunk/drivers/staging/line6/driver.c
index c476fcc3acf8..4513f78f1127 100644
--- a/trunk/drivers/staging/line6/driver.c
+++ b/trunk/drivers/staging/line6/driver.c
@@ -1300,26 +1300,7 @@ static struct usb_driver line6_driver = {
 	.id_table = line6_id_table,
 };
 
-/*
-	Module initialization.
-*/
-static int __init line6_init(void)
-{
-	printk(KERN_INFO "%s driver version %s\n", DRIVER_NAME, DRIVER_VERSION);
-
-	return usb_register(&line6_driver);
-}
-
-/*
-	Module cleanup.
-*/
-static void __exit line6_exit(void)
-{
-	usb_deregister(&line6_driver);
-}
-
-module_init(line6_init);
-module_exit(line6_exit);
+module_usb_driver(line6_driver);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);