Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[powerpc.git] / drivers / i2c / chips / isp1301_omap.c

diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index d2a100d..e6f1ab7 100644 (file)
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -1632,11 +1632,9 @@ static int isp1301_scan_bus(struct i2c_adapter *bus)
 }
 
 static struct i2c_driver isp1301_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "isp1301_omap",
-       .id             = 1301,         /* FIXME "official", i2c-ids.h */
-       .class          = I2C_CLASS_HWMON,
-       .flags          = I2C_DF_NOTIFY,
+       .driver = {
+               .name   = "isp1301_omap",
+       },
        .attach_adapter = isp1301_scan_bus,
        .detach_client  = isp1301_detach_client,
 };