ARM: OMAP: Fix menelaus.c compile for GCC 4.1.0:

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / menelaus.c

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index f77c9dfd29de51b415d5c79dd30681fdb61be101..c3a750e56c430c330d4b0c586dda5823a1d2c47d 100644 (file)
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -255,7 +255,7 @@ static int menelaus_mmc_cd_work(struct menelaus_chip *menelaus)
 }
 
 /* Initializes MMC slots */
-void menelaus_mmc_register(void (*callback)(u8 card_mask), unsigned long data)
+void menelaus_mmc_register(void (*callback)(unsigned long data, u8 card_mask), unsigned long data)
 {
        int reg;
 
@@ -450,11 +450,11 @@ static int menelaus_scan_bus(struct i2c_adapter *bus)
 }
 
 static struct i2c_driver menelaus_i2c_driver = {
-       .owner          = THIS_MODULE,
-       .name           = DRIVER_NAME,
-       .id             = I2C_DRIVERID_EXP0, /*FIXME:accroding to i2c-ids.h */
+       .driver = {
+               .name           = DRIVER_NAME,
+       },
+       .id             = I2C_DRIVERID_MISC, /*FIXME:accroding to i2c-ids.h */
        .class          = I2C_CLASS_HWMON,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = menelaus_scan_bus,
        .detach_client  = menelaus_remove,
 };