From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 14 Jan 2011 10:21:59 +0000 (+0100)
Subject: ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_IMX ifdefs
X-Git-Tag: MMI-PSA29.97-13-9~20486^2~5^2~107^2~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=889faeaad0333f692f8acd870faeaa01bf1fc21d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_IMX ifdefs

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c
index f9a71096be49..1a83dc53e118 100644
--- a/arch/arm/mach-mx3/mach-mx31ads.c
+++ b/arch/arm/mach-mx3/mach-mx31ads.c
@@ -117,7 +117,6 @@ static inline int mxc_init_extuart(void)
 }
 #endif
 
-#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
 static const struct imxuart_platform_data uart_pdata __initconst = {
 	.flags = IMXUART_HAVE_RTSCTS,
 };
@@ -134,11 +133,6 @@ static inline void mxc_init_imx_uart(void)
 	mxc_iomux_setup_multiple_pins(uart_pins, ARRAY_SIZE(uart_pins), "uart-0");
 	imx31_add_imx_uart0(&uart_pdata);
 }
-#else /* !SERIAL_IMX */
-static inline void mxc_init_imx_uart(void)
-{
-}
-#endif /* !SERIAL_IMX */
 
 static void mx31ads_expio_irq_handler(u32 irq, struct irq_desc *desc)
 {