diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 05:54:43 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 05:54:43 -0400 |
| commit | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (patch) | |
| tree | f3e270923fa36c773eee3bb1f9981aab1711d938 /sound/soc/codecs/tlv320aic3x.c | |
| parent | 77b52b4c5c66175553ee59eb43f74366f1e54bde (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pat
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 630684f4a0bc..09b1661b8a3a 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c | |||
| @@ -539,8 +539,8 @@ static const char *intercon[][3] = { | |||
| 539 | {"HPRCOM", NULL, "Right HP Com"}, | 539 | {"HPRCOM", NULL, "Right HP Com"}, |
| 540 | 540 | ||
| 541 | /* Mono Output */ | 541 | /* Mono Output */ |
| 542 | {"MONOLOUT", NULL, "Mono Out"}, | 542 | {"MONO_LOUT", NULL, "Mono Out"}, |
| 543 | {"MONOLOUT", NULL, "Mono Out"}, | 543 | {"MONO_LOUT", NULL, "Mono Out"}, |
| 544 | 544 | ||
| 545 | /* Left Input */ | 545 | /* Left Input */ |
| 546 | {"Left Line1L Mux", "single-ended", "LINE1L"}, | 546 | {"Left Line1L Mux", "single-ended", "LINE1L"}, |