Merge tag 'v3.8-rc2' into next

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / ab3100-core.c

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index bf188bc9898681ee4da1dc3beb4d38b01d9034e4..2ec7725f4a083fe80dc329f1fa5a8a336f80b10a 100644 (file)
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -961,7 +961,7 @@ static int ab3100_probe(struct i2c_client *client,
        return err;
 }
 
-static int __devexit ab3100_remove(struct i2c_client *client)
+static int ab3100_remove(struct i2c_client *client)
 {
        struct ab3100 *ab3100 = i2c_get_clientdata(client);