diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /sound/soc/s3c24xx/smdk2443_wm9710.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'sound/soc/s3c24xx/smdk2443_wm9710.c')
| -rw-r--r-- | sound/soc/s3c24xx/smdk2443_wm9710.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index a2a4f5323c17..362258835e8d 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <sound/soc-dapm.h> | 20 | #include <sound/soc-dapm.h> |
| 21 | 21 | ||
| 22 | #include "../codecs/ac97.h" | 22 | #include "../codecs/ac97.h" |
| 23 | #include "s3c24xx-pcm.h" | 23 | #include "s3c-dma.h" |
| 24 | #include "s3c24xx-ac97.h" | 24 | #include "s3c-ac97.h" |
| 25 | 25 | ||
| 26 | static struct snd_soc_card smdk2443; | 26 | static struct snd_soc_card smdk2443; |
| 27 | 27 | ||
| @@ -29,7 +29,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { | |||
| 29 | { | 29 | { |
| 30 | .name = "AC97", | 30 | .name = "AC97", |
| 31 | .stream_name = "AC97 HiFi", | 31 | .stream_name = "AC97 HiFi", |
| 32 | .cpu_dai = &s3c2443_ac97_dai[0], | 32 | .cpu_dai = &s3c_ac97_dai[S3C_AC97_DAI_PCM], |
| 33 | .codec_dai = &ac97_dai, | 33 | .codec_dai = &ac97_dai, |
| 34 | }, | 34 | }, |
| 35 | }; | 35 | }; |