Merge branch 'for-linville' of git://github.com/kvalo/ath6kl

[~andy/linux] / drivers / mfd / ab3100-core.c

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 01781ae5d0d7f3de38c811dad727ecc179c94be7..2ec7725f4a083fe80dc329f1fa5a8a336f80b10a 100644 (file)
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -21,6 +21,7 @@
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
 #include <linux/mfd/core.h>
+#include <linux/mfd/ab3100.h>
 #include <linux/mfd/abx500.h>
 
 /* These are the only registers inside AB3100 used in this main file */
@@ -660,8 +661,7 @@ struct ab3100_init_setting {
        u8 setting;
 };
 
-static const struct ab3100_init_setting __devinitconst
-ab3100_init_settings[] = {
+static const struct ab3100_init_setting ab3100_init_settings[] = {
        {
                .abreg = AB3100_MCA,
                .setting = 0x01
@@ -707,7 +707,7 @@ ab3100_init_settings[] = {
        },
 };
 
-static int __devinit ab3100_setup(struct ab3100 *ab3100)
+static int ab3100_setup(struct ab3100 *ab3100)
 {
        int err = 0;
        int i;
@@ -802,7 +802,7 @@ struct ab_family_id {
        char    *name;
 };
 
-static const struct ab_family_id ids[] __devinitconst = {
+static const struct ab_family_id ids[] = {
        /* AB3100 */
        {
                .id = 0xc0,
@@ -856,7 +856,7 @@ static const struct ab_family_id ids[] __devinitconst = {
        },
 };
 
-static int __devinit ab3100_probe(struct i2c_client *client,
+static int ab3100_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
        struct ab3100 *ab3100;
@@ -961,7 +961,7 @@ static int __devinit 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);
 
@@ -985,7 +985,7 @@ static struct i2c_driver ab3100_driver = {
        },
        .id_table       = ab3100_id,
        .probe          = ab3100_probe,
-       .remove         = __devexit_p(ab3100_remove),
+       .remove         = ab3100_remove,
 };
 
 static int __init ab3100_i2c_init(void)