diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 22:51:06 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-08 13:59:22 +0200 |
| commit | ab0fc6ce4825311e1842bb3c46611d0f02d189df (patch) | |
| tree | 95230cf2a57d3e175089ba12e613b54b7aee58da | |
| parent | 9b819060d349e2247c471d8f055c91a597560da0 (diff) | |
| download | linux-ab0fc6ce4825311e1842bb3c46611d0f02d189df.tar.gz | |
ARM: ux500: move mach/msp.h to <linux/platform_data/*>
This header file only contains platform data structure definitions, so it's straightforward to move. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [Delete one include rather than move it] Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-audio.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/asoc-ux500-msp.h (renamed from arch/arm/mach-ux500/include/mach/msp.h) | 0 | ||||
| -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 |
6 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index 7209db7cdc72..43bbee1d20c1 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c @@ -13,7 +13,7 @@ #include <mach/devices.h> #include <mach/hardware.h> #include <mach/irqs.h> -#include <mach/msp.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include "ste-dma40-db8500.h" #include "board-mop500.h" diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index eaa605f5d90d..eb81caf1157e 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -9,7 +9,7 @@ /* For NOMADIK_NR_GPIO */ #include <mach/irqs.h> -#include <mach/msp.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include <linux/amba/mmci.h> /* Snowball specific GPIO assignments, this board has no GPIO expander */ diff --git a/arch/arm/mach-ux500/include/mach/msp.h b/include/linux/platform_data/asoc-ux500-msp.h index 9991aea3d577..9991aea3d577 100644 --- a/arch/arm/mach-ux500/include/mach/msp.h +++ b/include/linux/platform_data/asoc-ux500-msp.h diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 94a3e5705aaa..0d9713e4a440 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -19,9 +19,9 @@ #include <linux/clk.h> #include <linux/regulator/consumer.h> #include <linux/mfd/dbx500-prcmu.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include <mach/hardware.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 a26c6bf0a29b..a5820073c875 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -20,9 +20,9 @@ #include <linux/slab.h> #include <linux/io.h> #include <linux/of.h> +#include <linux/platform_data/asoc-ux500-msp.h> #include <mach/hardware.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 1311c0df7628..437f0c032c58 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -17,8 +17,6 @@ #include <linux/platform_device.h> -#include <mach/msp.h> - #define MSP_INPUT_FREQ_APB 48000000 /*** Stereo mode. Used for APB data accesses as 16 bits accesses (mono), |