Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next

4f9a84fe · Mark Brown · 43cd8bf1 · a10807ae · 4f9a84fe
Commit 4f9a84fe authored Feb 12, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/fsl/imx-audmux.c sound/soc/fsl/imx-audmux.c +1 -1

No files found.
--- 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;