Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / media / video / adv7170.c

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 48989ed..e61003d 100644 (file)
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -43,7 +43,6 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <linux/sched.h>
-#include <asm/segment.h>
 #include <linux/types.h>
 
 #include <linux/videodev.h>
@@ -391,7 +390,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-       .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7170;
@@ -422,7 +420,6 @@ adv7170_detect_client (struct i2c_adapter *adapter,
        client->addr = address;
        client->adapter = adapter;
        client->driver = &i2c_driver_adv7170;
-       client->flags = I2C_CLIENT_ALLOW_USE;
        if ((client->addr == I2C_ADV7170 >> 1) ||
            (client->addr == (I2C_ADV7170 >> 1) + 1)) {
                dname = adv7170_name;
@@ -500,11 +497,11 @@ adv7170_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7170 = {
-       .owner = THIS_MODULE,
-       .name = "adv7170",      /* name */
+       .driver = {
+               .name = "adv7170",      /* name */
+       },
 
        .id = I2C_DRIVERID_ADV7170,
-       .flags = I2C_DF_NOTIFY,
 
        .attach_adapter = adv7170_attach_adapter,
        .detach_client = adv7170_detach_client,