Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / media / video / bt819.c

diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 770cb9a..c38300f 100644 (file)
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -33,12 +33,10 @@
 #include <linux/ioctl.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/videodev2.h>
 #include <linux/slab.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 #include <media/bt819.h>
 
 MODULE_DESCRIPTION("Brooktree-819 video decoder driver");
@@ -537,9 +535,25 @@ static const struct i2c_device_id bt819_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, bt819_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "bt819",
-       .probe = bt819_probe,
-       .remove = bt819_remove,
-       .id_table = bt819_id,
+static struct i2c_driver bt819_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "bt819",
+       },
+       .probe          = bt819_probe,
+       .remove         = bt819_remove,
+       .id_table       = bt819_id,
 };
+
+static __init int init_bt819(void)
+{
+       return i2c_add_driver(&bt819_driver);
+}
+
+static __exit void exit_bt819(void)
+{
+       i2c_del_driver(&bt819_driver);
+}
+
+module_init(init_bt819);
+module_exit(exit_bt819);