Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c
index 62ac422..4e5dcea 100644 (file)
--- a/drivers/media/video/bt866.c
+++ b/drivers/media/video/bt866.c
@@ -34,11 +34,9 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("Brooktree-866 video encoder driver");
 MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -232,9 +230,25 @@ static const struct i2c_device_id bt866_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, bt866_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "bt866",
-       .probe = bt866_probe,
-       .remove = bt866_remove,
-       .id_table = bt866_id,
+static struct i2c_driver bt866_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "bt866",
+       },
+       .probe          = bt866_probe,
+       .remove         = bt866_remove,
+       .id_table       = bt866_id,
 };
+
+static __init int init_bt866(void)
+{
+       return i2c_add_driver(&bt866_driver);
+}
+
+static __exit void exit_bt866(void)
+{
+       i2c_del_driver(&bt866_driver);
+}
+
+module_init(init_bt866);
+module_exit(exit_bt866);