--- a/sound/soc/codecs/uda1380.c        2007-02-16 12:50:32.000000000 +0100
+++ b/sound/soc/codecs/uda1380.c        2007-02-18 13:44:13.000000000 +0100
@@ -144,16 +144,16 @@
 };
 
 static const struct snd_kcontrol_new uda1380_snd_controls[] = {
-       SOC_DOUBLE("Playback Volume", UDA1380_MVOL, 0, 8, 255, 1),
+       SOC_DOUBLE("Master Playback Volume", UDA1380_MVOL, 0, 8, 255, 1),
        SOC_DOUBLE("Mixer Volume", UDA1380_MIXVOL, 0, 8, 255, 1),
        SOC_ENUM("Sound Processing Filter Mode", uda1380_enum[2]),
-       SOC_DOUBLE("Treble Volume", UDA1380_MODE, 4, 12, 3, 0),
-       SOC_DOUBLE("Bass Volume", UDA1380_MODE, 0, 8, 15, 0),
+       SOC_DOUBLE("Tone Control - Treble", UDA1380_MODE, 4, 12, 3, 0),
+       SOC_DOUBLE("Tone Control - Bass", UDA1380_MODE, 0, 8, 15, 0),
        SOC_ENUM("Playback De-emphasis", uda1380_enum[0]),
        SOC_DOUBLE("Capture Volume", UDA1380_DEC, 0, 8, 127, 0),
        SOC_DOUBLE("Line Capture Volume", UDA1380_PGA, 0, 8, 15, 0),
        SOC_SINGLE("Mic Capture Volume", UDA1380_PGA, 8, 11, 0),
-       SOC_DOUBLE("Playback Switch", UDA1380_DEEMP, 3, 11, 1, 1),
+       SOC_SINGLE("Master Playback Switch", UDA1380_DEEMP, 14, 1, 1),
        SOC_SINGLE("Capture Switch", UDA1380_PGA, 15, 1, 0),
        SOC_SINGLE("AGC Timing", UDA1380_AGC, 8, 7, 0),
        SOC_SINGLE("AGC Target level", UDA1380_AGC, 2, 3, 1),