summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ad73311.c
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@slimlogic.co.uk>2010-11-03 14:11:27 +0000
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-11-03 14:11:27 +0000
commit8f987768eb99631374f4ab0bb19cd062baf1397d (patch)
treeb89aa5c207f7ba6a688f45657424b937f17ceb8a /sound/soc/codecs/ad73311.c
parent63f7526f26f0a9291ac3f7a986aa18ebfb61ec19 (diff)
parentc8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff)
downloadblackbird-op-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.tar.gz
blackbird-op-linux-8f987768eb99631374f4ab0bb19cd062baf1397d.zip
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'sound/soc/codecs/ad73311.c')
-rw-r--r--sound/soc/codecs/ad73311.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c
index c53955fe17b6..de799cd1ba72 100644
--- a/sound/soc/codecs/ad73311.c
+++ b/sound/soc/codecs/ad73311.c
@@ -47,7 +47,7 @@ static int ad73311_probe(struct platform_device *pdev)
&soc_codec_dev_ad73311, &ad73311_dai, 1);
}
-static int ad73311_remove(struct platform_device *pdev)
+static int __devexit ad73311_remove(struct platform_device *pdev)
{
snd_soc_unregister_codec(&pdev->dev);
return 0;
OpenPOWER on IntegriCloud