V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver

[linux-2.6-omap-h63xx.git] / drivers / media / video / bt866.c

diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c
index 772fd52d551aaf35a5a43cb363831e1f51be9bc8..96b415576f0deb8f5330eda6f758deb3cb76a73d 100644 (file)
--- a/drivers/media/video/bt866.c
+++ b/drivers/media/video/bt866.c
@@ -37,7 +37,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/pci.h>
 #include <linux/signal.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -258,7 +257,7 @@ static int bt866_write(struct bt866 *encoder,
                printk(KERN_WARNING "%s: I/O error #%d "
                       "(write 0x%02x/0x%02x)\n",
                       encoder->i2c->name, err, encoder->addr, subaddr);
-               schedule_timeout_interruptible(HZ/10);
+               schedule_timeout_interruptible(msecs_to_jiffies(100));
        }
        if (err == 3) {
                printk(KERN_WARNING "%s: giving up\n",
@@ -301,7 +300,6 @@ static struct i2c_client bt866_client_tmpl =
        .addr = 0,
        .adapter = NULL,
        .driver = &i2c_driver_bt866,
-       .usage_count = 0
 };
 
 static int bt866_found_proc(struct i2c_adapter *adapter,