diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 23:18:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 23:18:45 +0100 |
| commit | 4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20 (patch) | |
| tree | c646a4bc3da5afe7b2c7df9934da3cf4e8840cad /sound/soc | |
| parent | ASoC: arizona: Automatically manage input mutes (diff) | |
| parent | ASoC: fsl: imx-audmux: Fix sparse warning (diff) | |
| download | linux-4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20.tar.xz linux-4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20.zip | |
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound/soc')
| -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) } #endif -enum imx_audmux_type { +static enum imx_audmux_type { IMX21_AUDMUX, IMX31_AUDMUX, } audmux_type; |