diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-07-26 12:28:38 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-26 13:58:34 +0200 |
| commit | aa50fe55ace7451e6ad6812915db367c8cfd3bb3 (patch) | |
| tree | 2fe2d50bbdfb957b1066ffcdd2b1d32dcc756023 /sound/soc | |
| parent | ASoC: wm8994: Hold runtime PM reference while handling mic and jack IRQs (diff) | |
| download | linux-aa50fe55ace7451e6ad6812915db367c8cfd3bb3.tar.xz linux-aa50fe55ace7451e6ad6812915db367c8cfd3bb3.zip | |
ASoC: ux500: Include the correct header files
Thought to be another merge error, board-mop500-msp.h has never existed
in the upstream kernel, only msp.h. This patch changes the include files
to match the existing file name.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 2 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.c | 2 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 62ac0285bfaf..057e28ef770e 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -21,7 +21,7 @@ #include <linux/mfd/dbx500-prcmu.h> #include <mach/hardware.h> -#include <mach/board-mop500-msp.h> +#include <mach/msp.h> #include <sound/soc.h> #include <sound/soc-dai.h> diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index ee14d2dac2f5..5c472f335a64 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -19,7 +19,7 @@ #include <linux/slab.h> #include <mach/hardware.h> -#include <mach/board-mop500-msp.h> +#include <mach/msp.h> #include <sound/soc.h> diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 7f71b4a0d4bc..2d9136da9865 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -17,7 +17,7 @@ #include <linux/platform_device.h> -#include <mach/board-mop500-msp.h> +#include <mach/msp.h> #define MSP_INPUT_FREQ_APB 48000000 |