Merge branch 'next' into for-linus

[~andy/linux] / drivers / media / video / gspca / sq930x.c

diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c
index e4255b4905e705bb2a0bb3c48c2382033f292b13..1a8ba9b3550a08ce86b1f03a0cf1b80e9d3b1d09 100644 (file)
--- a/drivers/media/video/gspca/sq930x.c
+++ b/drivers/media/video/gspca/sq930x.c
@@ -1197,15 +1197,4 @@ static struct usb_driver sd_driver = {
 #endif
 };
 
-/* -- module insert / remove -- */
-static int __init sd_mod_init(void)
-{
-       return usb_register(&sd_driver);
-}
-static void __exit sd_mod_exit(void)
-{
-       usb_deregister(&sd_driver);
-}
-
-module_init(sd_mod_init);
-module_exit(sd_mod_exit);
+module_usb_driver(sd_driver);