diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-01-23 10:29:27 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:40 +0200 |
| commit | 15c40b1c77c56b2362e2534d47a0078de69ed00c (patch) | |
| tree | b6082447500da4217fb83d917535d4b3b1ae484a | |
| parent | 2656b9b69ac4b444d66465335c06e2c5917ac7ce (diff) | |
mach-ux500: msp: CONFIG_STM_MSP_I2S to CONFIG_STM_MSP_SPI renaming
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index ea88a4142bb..0b6713e989b 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -55,7 +55,7 @@ ifdef CONFIG_SENSORS_LSM303DLH obj-$(CONFIG_MACH_MOP500) += board-mop500-sensors.o endif obj-$(CONFIG_FB_MCDE) += board-mcde.o -ifdef CONFIG_STM_MSP_I2S +ifdef CONFIG_STM_MSP_SPI obj-$(CONFIG_MACH_MOP500) += board-mop500-msp.o endif ifdef CONFIG_CW1200 diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index be0deac0caf..974da6eac8f 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -34,7 +34,7 @@ #include <linux/gpio_keys.h> #include <linux/delay.h> #include <linux/mfd/ab8500/denc.h> -#ifdef CONFIG_STM_MSP_I2S +#ifdef CONFIG_STM_MSP_SPI #include <linux/spi/stm_msp.h> #endif #include <linux/leds_pwm.h> @@ -917,7 +917,7 @@ static struct platform_device *mop500_platform_devs[] __initdata = { #endif }; -#ifdef CONFIG_STM_MSP_I2S +#ifdef CONFIG_STM_MSP_SPI /* * MSP-SPI */ @@ -981,7 +981,7 @@ static void __init mop500_spi_init(struct device *parent) static void __init mop500_spi_init(struct device *parent) { } -#endif /* CONFIG_STM_MSP_I2S */ +#endif /* CONFIG_STM_MSP_SPI */ #ifdef CONFIG_STE_DMA40_REMOVE static struct stedma40_chan_cfg uart0_dma_cfg_rx = { @@ -1176,7 +1176,7 @@ static void __init mop500_init_machine(void) mop500_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); -#ifdef CONFIG_STM_MSP_I2S +#ifdef CONFIG_STM_MSP_SPI mop500_msp_init(); #endif #if defined(CONFIG_CW1200) || defined(CONFIG_CW1200_MODULE) @@ -1227,7 +1227,7 @@ static void __init snowball_init_machine(void) snowball_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); -#ifdef CONFIG_STM_MSP_I2S +#ifdef CONFIG_STM_MSP_SPI mop500_msp_init(); #endif #if defined(CONFIG_CW1200) || defined(CONFIG_CW1200_MODULE) @@ -1289,7 +1289,7 @@ static void __init hrefv60_init_machine(void) hrefv60_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); -#ifdef CONFIG_STM_MSP_I2S +#ifdef CONFIG_STM_MSP_SPI mop500_msp_init(); #endif #if defined(CONFIG_CW1200) || defined(CONFIG_CW1200_MODULE) |