diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 17:18:45 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 17:18:45 -0500 |
| commit | 4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20 (patch) | |
| tree | c646a4bc3da5afe7b2c7df9934da3cf4e8840cad /sound | |
| parent | 43cd8bf1c8d8f6e897ed0f2c4bd50a4266b5c36e (diff) | |
| parent | a10807aef5cab5568e70a2d1597305999d93f85d (diff) | |
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-audmux.c | 2 |
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) | |||
| 176 | } | 176 | } |
| 177 | #endif | 177 | #endif |
| 178 | 178 | ||
| 179 | enum imx_audmux_type { | 179 | static enum imx_audmux_type { |
| 180 | IMX21_AUDMUX, | 180 | IMX21_AUDMUX, |
| 181 | IMX31_AUDMUX, | 181 | IMX31_AUDMUX, |
| 182 | } audmux_type; | 182 | } audmux_type; |