diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 03:52:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 03:52:49 +0200 |
| commit | 7c5814c7199851c5fe9395d08fc1ab3c8c1531ea (patch) | |
| tree | 66cc9080e47c0be8bd9d4530626e54c77f9895ed /sound/soc/fsl/pcm030-audio-fabric.c | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ALSA: usb-audio: automatically detect feedback format (diff) | |
| download | linux-7c5814c7199851c5fe9395d08fc1ab3c8c1531ea.tar.xz linux-7c5814c7199851c5fe9395d08fc1ab3c8c1531ea.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: usb-audio: automatically detect feedback format
ASoC: sound/wm9090: add missing __devexit marker
ASoC: sound/max98088: add missing __devexit marker
ASoC: sound/ad73311: add missing __devexit marker
ASoC: fsl - fix build error in pcm030-audio-fabric.c
sound/oss/sb_ess.c: delete double assignment
ALSA: hda - Change BTL amp level on some HP notebooks
Diffstat (limited to 'sound/soc/fsl/pcm030-audio-fabric.c')
| -rw-r--r-- | sound/soc/fsl/pcm030-audio-fabric.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index fe15bb26e484..25f27ec1dd6e 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -24,7 +24,6 @@ #include <sound/pcm_params.h> #include <sound/initval.h> #include <sound/soc.h> -#include <sound/soc-of-simple.h> #include "mpc5200_dma.h" #include "mpc5200_psc_ac97.h" @@ -49,7 +48,7 @@ static struct snd_soc_dai_link pcm030_fabric_dai[] = { .codec_dai_name = "wm9712-aux", .cpu_dai_name = "mpc5200-psc-ac97.1", .platform_name = "mpc5200-pcm-audio", - ..codec_name = "wm9712-codec", + .codec_name = "wm9712-codec", }, }; |