Merge remote-tracking branch 'asoc/fix/sta529' into tmp

[karo-tx-linux.git] / drivers / misc / apds990x.c

diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
index f955d546f2df806359f531dc3a75bf0b122fe7f5..0e67f8263cd8bf421c939ae8870f5e4503af2961 100644 (file)
--- a/drivers/misc/apds990x.c
+++ b/drivers/misc/apds990x.c
@@ -1047,7 +1047,7 @@ static struct attribute_group apds990x_attribute_group[] = {
        {.attrs = sysfs_attrs_ctrl },
 };
 
-static int __devinit apds990x_probe(struct i2c_client *client,
+static int apds990x_probe(struct i2c_client *client,
                                const struct i2c_device_id *id)
 {
        struct apds990x_chip *chip;
@@ -1181,7 +1181,7 @@ fail1:
        return err;
 }
 
-static int __devexit apds990x_remove(struct i2c_client *client)
+static int apds990x_remove(struct i2c_client *client)
 {
        struct apds990x_chip *chip = i2c_get_clientdata(client);