diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-03-05 15:30:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-06 01:03:00 +0100 |
| commit | 3c77c29c49c6213c55ad8dacc687817b3568c0ce (patch) | |
| tree | aa2470aafbd4434d3d7429265ed70e163d45b7f8 /sound/soc/imx/wm1133-ev1.c | |
| parent | ARM: imx: convert audmux to a platform driver (diff) | |
| download | linux-3c77c29c49c6213c55ad8dacc687817b3568c0ce.tar.xz linux-3c77c29c49c6213c55ad8dacc687817b3568c0ce.zip | |
ASoC: imx: move audmux driver into sound/soc/imx
As audmux becomes a platform driver and its callers are all ASoC
machine drivers, there is no reason to keep it in arch folder, so
move it to sound/soc/imx.
One bonus point would be those ASoC machine drivers stop including
mach/audmux.h, since it's been moved to sound/soc/imx/imx-audmux.h.
This should be a move to the right direction in terms of single kernel
image goal.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/imx/wm1133-ev1.c')
| -rw-r--r-- | sound/soc/imx/wm1133-ev1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c index 37480c90e997..15056d6a1643 100644 --- a/sound/soc/imx/wm1133-ev1.c +++ b/sound/soc/imx/wm1133-ev1.c @@ -21,10 +21,9 @@ #include <sound/pcm_params.h> #include <sound/soc.h> -#include <mach/audmux.h> - #include "imx-ssi.h" #include "../codecs/wm8350.h" +#include "imx-audmux.h" /* There is a silicon mic on the board optionally connected via a solder pad * SP1. Define this to enable it. |