aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2013-03-21 20:15:02 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-04-03 04:50:54 -0400
commit4f5ef62ced8e7e01179de734856e03bddb06389c (patch)
tree7386009c7e8caa62d1ef793cc681dddabf378a50
parentf8c11b2b36a7a0f14ac98c4ca599151e1a720132 (diff)
ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro
Commit 2d66c7803595da0d4bcd949825d598575f5de9e6 ("cpuimx27 and mbimx27: allow fine control of UART4 and SDHC2 usage") added the Kconfig symbol MACH_EUKREA_CPUIMX27_USEUART4. But it forgot to prepend CONFIG_ to the use of its macro. Add that prefix now. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/mach-imx/eukrea_mbimx27-baseboard.c4
-rw-r--r--arch/arm/mach-imx/mach-cpuimx27.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
index b4c70028d359..b2f08bfbbdd3 100644
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
@@ -46,7 +46,7 @@ static const int eukrea_mbimx27_pins[] __initconst = {
46 PE10_PF_UART3_CTS, 46 PE10_PF_UART3_CTS,
47 PE11_PF_UART3_RTS, 47 PE11_PF_UART3_RTS,
48 /* UART4 */ 48 /* UART4 */
49#if !defined(MACH_EUKREA_CPUIMX27_USEUART4) 49#if !defined(CONFIG_MACH_EUKREA_CPUIMX27_USEUART4)
50 PB26_AF_UART4_RTS, 50 PB26_AF_UART4_RTS,
51 PB28_AF_UART4_TXD, 51 PB28_AF_UART4_TXD,
52 PB29_AF_UART4_CTS, 52 PB29_AF_UART4_CTS,
@@ -306,7 +306,7 @@ void __init eukrea_mbimx27_baseboard_init(void)
306 306
307 imx27_add_imx_uart1(&uart_pdata); 307 imx27_add_imx_uart1(&uart_pdata);
308 imx27_add_imx_uart2(&uart_pdata); 308 imx27_add_imx_uart2(&uart_pdata);
309#if !defined(MACH_EUKREA_CPUIMX27_USEUART4) 309#if !defined(CONFIG_MACH_EUKREA_CPUIMX27_USEUART4)
310 imx27_add_imx_uart3(&uart_pdata); 310 imx27_add_imx_uart3(&uart_pdata);
311#endif 311#endif
312 312
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 146559311bd2..ea50870bda80 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -48,7 +48,7 @@ static const int eukrea_cpuimx27_pins[] __initconst = {
48 PE14_PF_UART1_CTS, 48 PE14_PF_UART1_CTS,
49 PE15_PF_UART1_RTS, 49 PE15_PF_UART1_RTS,
50 /* UART4 */ 50 /* UART4 */
51#if defined(MACH_EUKREA_CPUIMX27_USEUART4) 51#if defined(CONFIG_MACH_EUKREA_CPUIMX27_USEUART4)
52 PB26_AF_UART4_RTS, 52 PB26_AF_UART4_RTS,
53 PB28_AF_UART4_TXD, 53 PB28_AF_UART4_TXD,
54 PB29_AF_UART4_CTS, 54 PB29_AF_UART4_CTS,
@@ -272,7 +272,7 @@ static void __init eukrea_cpuimx27_init(void)
272 /* SDHC2 can be used for Wifi */ 272 /* SDHC2 can be used for Wifi */
273 imx27_add_mxc_mmc(1, NULL); 273 imx27_add_mxc_mmc(1, NULL);
274#endif 274#endif
275#if defined(MACH_EUKREA_CPUIMX27_USEUART4) 275#if defined(CONFIG_MACH_EUKREA_CPUIMX27_USEUART4)
276 /* in which case UART4 is also used for Bluetooth */ 276 /* in which case UART4 is also used for Bluetooth */
277 imx27_add_imx_uart3(&uart_pdata); 277 imx27_add_imx_uart3(&uart_pdata);
278#endif 278#endif