Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 8eb871d0e85b..60508069bbed 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -323,7 +323,6 @@ bt856_detect_client (struct i2c_adapter *adapter,
         client->addr = address;
         client->adapter = adapter;
         client->driver = &i2c_driver_bt856;
-        client->flags = I2C_CLIENT_ALLOW_USE;
         strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));
 
         encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);
@@ -405,11 +404,11 @@ bt856_detach_client (struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_bt856 = {
-        .owner = THIS_MODULE,
-        .name = "bt856",
+        .driver = {
+                .name = "bt856",
+        },
 
         .id = I2C_DRIVERID_BT856,
-        .flags = I2C_DF_NOTIFY,
 
         .attach_adapter = bt856_attach_adapter,
         .detach_client = bt856_detach_client,