Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' and 'linus...

[linux-2.6-omap-h63xx.git] / drivers / video / i810 / i810-i2c.c

diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index 961f4d40446799ac1fdcbec9f15e533f2ee2abc5..9dd55e5324a13d9653b0b77a0a77ca1e8f9be751 100644 (file)
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -10,7 +10,6 @@
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/fb.h>
@@ -91,7 +90,6 @@ static int i810_setup_i2c_bus(struct i810fb_i2c_chan *chan, const char *name)
         chan->adapter.owner             = THIS_MODULE;
         chan->adapter.algo_data         = &chan->algo;
         chan->adapter.dev.parent        = &chan->par->dev->dev;
-       chan->adapter.id                = I2C_HW_B_I810;
        chan->algo.setsda               = i810i2c_setsda;
        chan->algo.setscl               = i810i2c_setscl;
        chan->algo.getsda               = i810i2c_getsda;