diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-29 22:54:18 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-29 22:54:18 -0400 |
| commit | d21685ec258f803d3badae5eae821383a34815a9 (patch) | |
| tree | 7ab60a2a5d557a4f345b01a79ca2f877c06d9b92 /sound/soc/atmel | |
| parent | 74ab24af4fe165de5af01d0507250dd099f096b0 (diff) | |
| parent | ea02c63d57d7ec099f66ddb2942b4022e865cd5f (diff) | |
Merge branch 'for-2.6.40' into for-2.6.41
Diffstat (limited to 'sound/soc/atmel')
| -rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 28afbbf69ce0..95572d290c27 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
| @@ -146,7 +146,7 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) | |||
| 146 | "at91sam9g20ek_wm8731 " | 146 | "at91sam9g20ek_wm8731 " |
| 147 | ": at91sam9g20ek_wm8731_init() called\n"); | 147 | ": at91sam9g20ek_wm8731_init() called\n"); |
| 148 | 148 | ||
| 149 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, | 149 | ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK, |
| 150 | MCLK_RATE, SND_SOC_CLOCK_IN); | 150 | MCLK_RATE, SND_SOC_CLOCK_IN); |
| 151 | if (ret < 0) { | 151 | if (ret < 0) { |
| 152 | printk(KERN_ERR "Failed to set WM8731 SYSCLK: %d\n", ret); | 152 | printk(KERN_ERR "Failed to set WM8731 SYSCLK: %d\n", ret); |