summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mt9v011.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 10:13:01 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-05-24 10:13:01 +0200
commite644dae645e167d154c0526358940986682a72b0 (patch)
tree972993c6568085b8d407fc7e13de10f4b93c651d /drivers/media/video/mt9v011.c
parentInput: synaptics - fix regression with "image sensor" trackpads (diff)
parentInput: matrix-keymap - fix building keymaps (diff)
downloadlinux-e644dae645e167d154c0526358940986682a72b0.tar.xz
linux-e644dae645e167d154c0526358940986682a72b0.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/media/video/mt9v011.c')
-rw-r--r--drivers/media/video/mt9v011.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/video/mt9v011.c b/drivers/media/video/mt9v011.c
index db74dd27c722..6bf01ad62765 100644
--- a/drivers/media/video/mt9v011.c
+++ b/drivers/media/video/mt9v011.c
@@ -709,15 +709,4 @@ static struct i2c_driver mt9v011_driver = {
.id_table = mt9v011_id,
};
-static __init int init_mt9v011(void)
-{
- return i2c_add_driver(&mt9v011_driver);
-}
-
-static __exit void exit_mt9v011(void)
-{
- i2c_del_driver(&mt9v011_driver);
-}
-
-module_init(init_mt9v011);
-module_exit(exit_mt9v011);
+module_i2c_driver(mt9v011_driver);