Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

[~andy/linux] / sound / soc / samsung / spdif.c

diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index 28c491dacf7a9aca23463e15bf72c64abf0b0b2c..3122f3154bfa7295f0de3650533e8eafa4c8608b 100644 (file)
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -340,7 +340,7 @@ static struct snd_soc_dai_ops spdif_dai_ops = {
        .shutdown       = spdif_shutdown,
 };
 
-struct snd_soc_dai_driver samsung_spdif_dai = {
+static struct snd_soc_dai_driver samsung_spdif_dai = {
        .name = "samsung-spdif",
        .playback = {
                .stream_name = "S/PDIF Playback",
@@ -475,7 +475,7 @@ static __devexit int spdif_remove(struct platform_device *pdev)
 
 static struct platform_driver samsung_spdif_driver = {
        .probe  = spdif_probe,
-       .remove = spdif_remove,
+       .remove = __devexit_p(spdif_remove),
        .driver = {
                .name   = "samsung-spdif",
                .owner  = THIS_MODULE,