Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...

[mv-sheeva.git] / drivers / media / video / saa7134 / saa6752hs.c

diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 40fd31ca7716da6ae74ee2b76697fa4d615f54b0..f9f29cc93a8ad42ea7d3c44d4361ceb24e8526c7 100644 (file)
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -36,7 +36,6 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
 
@@ -992,13 +991,29 @@ static const struct i2c_device_id saa6752hs_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, saa6752hs_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "saa6752hs",
-       .probe = saa6752hs_probe,
-       .remove = saa6752hs_remove,
-       .id_table = saa6752hs_id,
+static struct i2c_driver saa6752hs_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "saa6752hs",
+       },
+       .probe          = saa6752hs_probe,
+       .remove         = saa6752hs_remove,
+       .id_table       = saa6752hs_id,
 };
 
+static __init int init_saa6752hs(void)
+{
+       return i2c_add_driver(&saa6752hs_driver);
+}
+
+static __exit void exit_saa6752hs(void)
+{
+       i2c_del_driver(&saa6752hs_driver);
+}
+
+module_init(init_saa6752hs);
+module_exit(exit_saa6752hs);
+
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * ---------------------------------------------------------------------------