Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

[sfrench/cifs-2.6.git] / sound / soc / at91 / eti_b1_wm8731.c

diff --git a/sound/soc/at91/eti_b1_wm8731.c b/sound/soc/at91/eti_b1_wm8731.c
index 8179df3bb2f33cd3a833228ad827d7ece6460a7e..ad3ad9d662f879fea1932c45f16786b6f4e0f685 100644 (file)
--- a/sound/soc/at91/eti_b1_wm8731.c
+++ b/sound/soc/at91/eti_b1_wm8731.c
@@ -28,7 +28,6 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
@@ -40,7 +39,7 @@
 
 #include "../codecs/wm8731.h"
 #include "at91-pcm.h"
-#include "at91-i2s.h"
+#include "at91-ssc.h"
 
 #if 0
 #define        DBG(x...)       printk(KERN_INFO "eti_b1_wm8731: " x)
@@ -248,15 +247,15 @@ static int eti_b1_wm8731_init(struct snd_soc_codec *codec)
 
 static struct snd_soc_dai_link eti_b1_dai = {
        .name = "WM8731",
-       .stream_name = "WM8731",
-       .cpu_dai = &at91_i2s_dai[1],
+       .stream_name = "WM8731 PCM",
+       .cpu_dai = &at91_ssc_dai[1],
        .codec_dai = &wm8731_dai,
        .init = eti_b1_wm8731_init,
        .ops = &eti_b1_ops,
 };
 
 static struct snd_soc_machine snd_soc_machine_eti_b1 = {
-       .name = "ETI_B1",
+       .name = "ETI_B1_WM8731",
        .dai_link = &eti_b1_dai,
        .num_links = 1,
 };