diff options
| author | Len Brown <len.brown@intel.com> | 2012-04-07 03:48:59 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-04-07 03:48:59 +0200 |
| commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
| tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /drivers/media/video/ov9640.c | |
| parent | cpuidle: Fix panic in CPU off-lining with no idle driver (diff) | |
| parent | MAINTAINERS: Update git url for ACPI (diff) | |
| download | linux-eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c.tar.xz linux-eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c.zip | |
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'drivers/media/video/ov9640.c')
| -rw-r--r-- | drivers/media/video/ov9640.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c index a4f99797eb56..23412debb36b 100644 --- a/drivers/media/video/ov9640.c +++ b/drivers/media/video/ov9640.c @@ -738,18 +738,7 @@ static struct i2c_driver ov9640_i2c_driver = { .id_table = ov9640_id, }; -static int __init ov9640_module_init(void) -{ - return i2c_add_driver(&ov9640_i2c_driver); -} - -static void __exit ov9640_module_exit(void) -{ - i2c_del_driver(&ov9640_i2c_driver); -} - -module_init(ov9640_module_init); -module_exit(ov9640_module_exit); +module_i2c_driver(ov9640_i2c_driver); MODULE_DESCRIPTION("SoC Camera driver for OmniVision OV96xx"); MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>"); |