Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next

[linux-2.6-block.git] / drivers / media / video / adv7170.c

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 879f1d839760a5588376358c81128ededa8cee81..6bc01fb98ff8bfad5c7c6e173d78f6151b6b3277 100644 (file)
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -407,15 +407,4 @@ static struct i2c_driver adv7170_driver = {
        .id_table       = adv7170_id,
 };
 
-static __init int init_adv7170(void)
-{
-       return i2c_add_driver(&adv7170_driver);
-}
-
-static __exit void exit_adv7170(void)
-{
-       i2c_del_driver(&adv7170_driver);
-}
-
-module_init(init_adv7170);
-module_exit(exit_adv7170);
+module_i2c_driver(adv7170_driver);