diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /sound/soc/atmel/sam9g20_wm8731.c | |
| parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'sound/soc/atmel/sam9g20_wm8731.c')
| -rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 1fb59a9d3719..6ea04be911d0 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
| @@ -221,8 +221,8 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_codec *codec) | |||
| 221 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); | 221 | snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon)); |
| 222 | 222 | ||
| 223 | /* not connected */ | 223 | /* not connected */ |
| 224 | snd_soc_dapm_disable_pin(codec, "RLINEIN"); | 224 | snd_soc_dapm_nc_pin(codec, "RLINEIN"); |
| 225 | snd_soc_dapm_disable_pin(codec, "LLINEIN"); | 225 | snd_soc_dapm_nc_pin(codec, "LLINEIN"); |
| 226 | 226 | ||
| 227 | /* always connected */ | 227 | /* always connected */ |
| 228 | snd_soc_dapm_enable_pin(codec, "Int Mic"); | 228 | snd_soc_dapm_enable_pin(codec, "Int Mic"); |