Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / staging / media / go7007 / go7007-usb.c

diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index cffb0b3b93e822eb71d104fa51ff35e099fec248..70e006b50f292259025b50a5b03a2aa26a9c2b5f 100644 (file)
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@ -1278,17 +1278,4 @@ static struct usb_driver go7007_usb_driver = {
        .id_table       = go7007_usb_id_table,
 };
 
-static int __init go7007_usb_init(void)
-{
-       return usb_register(&go7007_usb_driver);
-}
-
-static void __exit go7007_usb_cleanup(void)
-{
-       usb_deregister(&go7007_usb_driver);
-}
-
-module_init(go7007_usb_init);
-module_exit(go7007_usb_cleanup);
-
-MODULE_LICENSE("GPL v2");
+module_usb_driver(go7007_usb_driver);