diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 15:21:27 (GMT) |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 15:21:27 (GMT) |
| commit | 89a4150331bc07014256714678ce8e9b238fc145 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /sound | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
| download | linux-fsl-qoriq-89a4150331bc07014256714678ce8e9b238fc145.tar.xz | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-pcm-fiq.c | 1 | ||||
| -rw-r--r-- | sound/soc/fsl/imx-ssi.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c index 22c6130..9ffc9e6 100644 --- a/sound/soc/fsl/imx-pcm-fiq.c +++ b/sound/soc/fsl/imx-pcm-fiq.c @@ -29,7 +29,6 @@ #include <asm/fiq.h> -#include <mach/irqs.h> #include <linux/platform_data/asoc-imx-ssi.h> #include "imx-ssi.h" diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 006f7d4..dd56644 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -48,7 +48,6 @@ #include <sound/soc.h> #include <linux/platform_data/asoc-imx-ssi.h> -#include <mach/hardware.h> #include "imx-ssi.h" |