summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-14 11:21:59 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-27 12:51:20 +0100
commit889faeaad0333f692f8acd870faeaa01bf1fc21d (patch)
tree77a424381844abd62355ba6abe0ee6375e80ea83
parentafc11e6ef7547243f1429cce8de616049439a172 (diff)
downloadop-kernel-dev-889faeaad0333f692f8acd870faeaa01bf1fc21d.zip
op-kernel-dev-889faeaad0333f692f8acd870faeaa01bf1fc21d.tar.gz
ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx3/mach-mx31ads.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-mx3/mach-mx31ads.c
index f9a7109..1a83dc5 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)
{
OpenPOWER on IntegriCloud