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

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/akita-ioexp.c b/arch/arm/mach-pxa/akita-ioexp.c
index f6d73cc01f78..1b398742ab56 100644
--- a/arch/arm/mach-pxa/akita-ioexp.c
+++ b/arch/arm/mach-pxa/akita-ioexp.c
@@ -124,17 +124,16 @@ static int max7310_detach_client(struct i2c_client *client)
 }
 
 static struct i2c_driver max7310_i2c_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "akita-max7310",
+        .driver = {
+                .name   = "akita-max7310",
+        },
         .id             = I2C_DRIVERID_AKITAIOEXP,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = max7310_attach_adapter,
         .detach_client  = max7310_detach_client,
 };
 
 static struct i2c_client max7310_template = {
         name:   "akita-max7310",
-        flags:  I2C_CLIENT_ALLOW_USE,
         driver: &max7310_i2c_driver,
 };