summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-12 22:18:45 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-12 22:18:45 +0000
commit4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20 (patch)
treec646a4bc3da5afe7b2c7df9934da3cf4e8840cad /sound
parent43cd8bf1c8d8f6e897ed0f2c4bd50a4266b5c36e (diff)
parenta10807aef5cab5568e70a2d1597305999d93f85d (diff)
downloadlinux-stable-4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20.tar.gz
linux-stable-4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20.tar.bz2
linux-stable-4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20.zip
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/imx-audmux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 251f4d981e0c..fab912ea7a50 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -176,7 +176,7 @@ static inline void audmux_debugfs_remove(void)
}
#endif
-enum imx_audmux_type {
+static enum imx_audmux_type {
IMX21_AUDMUX,
IMX31_AUDMUX,
} audmux_type;