Merge branch 'for-2.6.36' into for-2.6.37

[~andy/linux] / arch / arm / plat-mxc / audmux-v2.c

diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
index f9e7cdbd000568a562ac4bd062a550df73f3a853..910374d1d486bb5086178c37fc6e24f51848ded5 100644 (file)
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ b/arch/arm/plat-mxc/audmux-v2.c
@@ -45,9 +45,9 @@ static const char *audmux_port_string(int port)
 {
        switch (port) {
        case MX31_AUDMUX_PORT1_SSI0:
-               return "imx-ssi.0";
+               return "imx-ssi-dai.0";
        case MX31_AUDMUX_PORT2_SSI1:
-               return "imx-ssi.1";
+               return "imx-ssi-dai.1";
        case MX31_AUDMUX_PORT3_SSI_PINS_3:
                return "SSI3";
        case MX31_AUDMUX_PORT4_SSI_PINS_4: