diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
| commit | 53640f41b97792b0889bb70f26f99c06743162a1 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /sound | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
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 22c6130957ba..9ffc9e66308f 100644 --- a/sound/soc/fsl/imx-pcm-fiq.c +++ b/sound/soc/fsl/imx-pcm-fiq.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <asm/fiq.h> | 30 | #include <asm/fiq.h> |
| 31 | 31 | ||
| 32 | #include <mach/irqs.h> | ||
| 33 | #include <linux/platform_data/asoc-imx-ssi.h> | 32 | #include <linux/platform_data/asoc-imx-ssi.h> |
| 34 | 33 | ||
| 35 | #include "imx-ssi.h" | 34 | #include "imx-ssi.h" |
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 006f7d465ed2..dd566444e3c3 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <sound/soc.h> | 48 | #include <sound/soc.h> |
| 49 | 49 | ||
| 50 | #include <linux/platform_data/asoc-imx-ssi.h> | 50 | #include <linux/platform_data/asoc-imx-ssi.h> |
| 51 | #include <mach/hardware.h> | ||
| 52 | 51 | ||
| 53 | #include "imx-ssi.h" | 52 | #include "imx-ssi.h" |
| 54 | 53 | ||