Merge branch 'linus' into x86/cleanups

[linux-2.6] / sound / soc / sh / dma-sh7760.c

diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c
index cdee374b843efd9a4d7258f0c2e2b6c3408a7024..9faa12622d09c07895c48cdf5d96ff6cfd47e38e 100644 (file)
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -327,7 +326,7 @@ static void camelot_pcm_free(struct snd_pcm *pcm)
 }
 
 static int camelot_pcm_new(struct snd_card *card,
-                          struct snd_soc_codec_dai *dai,
+                          struct snd_soc_dai *dai,
                           struct snd_pcm *pcm)
 {
        /* dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel