Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[can-eth-gw-linux.git] / sound / soc / codecs / wm9090.c

diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c
index bb55a70a104a6c45658fefbf83f9ee75cecc9f83..a07fe1618eec439d3ba001573331f4046b4e2095 100644 (file)
--- a/sound/soc/codecs/wm9090.c
+++ b/sound/soc/codecs/wm9090.c
@@ -664,7 +664,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c,
        return 0;
 }
 
-static int __devexit wm9090_i2c_remove(struct i2c_client *i2c)
+static int wm9090_i2c_remove(struct i2c_client *i2c)
 {
        snd_soc_unregister_codec(&i2c->dev);
        return 0;
@@ -683,7 +683,7 @@ static struct i2c_driver wm9090_i2c_driver = {
                .owner = THIS_MODULE,
        },
        .probe = wm9090_i2c_probe,
-       .remove = __devexit_p(wm9090_i2c_remove),
+       .remove = wm9090_i2c_remove,
        .id_table = wm9090_id,
 };