diff --git a/[refs] b/[refs] index 126d1f1fa0d7..8d18529aebaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3075388881fbafda3b0991fbefc6a5eef4d483c +refs/heads/master: e52ec68015b81ccd5f0950d56328b78f43ae2985 diff --git a/trunk/drivers/media/usb/gspca/jl2005bcd.c b/trunk/drivers/media/usb/gspca/jl2005bcd.c index 62ba80d9b998..fdaeeb14453f 100644 --- a/trunk/drivers/media/usb/gspca/jl2005bcd.c +++ b/trunk/drivers/media/usb/gspca/jl2005bcd.c @@ -536,20 +536,4 @@ static struct usb_driver sd_driver = { #endif }; -/* -- module insert / remove -- */ -static int __init sd_mod_init(void) -{ - int ret; - - ret = usb_register(&sd_driver); - if (ret < 0) - return ret; - return 0; -} -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);