Merge branch 'for-3.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / mfd / max8907.c

diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 17f2593d82b87e2571c5e67667fae0b684f57cc9..e9b1c93a3ade36ba41de62bff0bd588fd4148162 100644 (file)
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -183,7 +183,7 @@ static void max8907_power_off(void)
                        MAX8907_MASK_POWER_OFF, MAX8907_MASK_POWER_OFF);
 }
 
-static __devinit int max8907_i2c_probe(struct i2c_client *i2c,
+static int max8907_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *id)
 {
        struct max8907 *max8907;
@@ -288,7 +288,7 @@ err_alloc_drvdata:
        return ret;
 }
 
-static __devexit int max8907_i2c_remove(struct i2c_client *i2c)
+static int max8907_i2c_remove(struct i2c_client *i2c)
 {
        struct max8907 *max8907 = i2c_get_clientdata(i2c);