diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 05:21:59 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 06:51:20 -0500 |
commit | 889faeaad0333f692f8acd870faeaa01bf1fc21d (patch) | |
tree | 77a424381844abd62355ba6abe0ee6375e80ea83 | |
parent | afc11e6ef7547243f1429cce8de616049439a172 (diff) |
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.c | 6 |
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 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) | |||
117 | } | 117 | } |
118 | #endif | 118 | #endif |
119 | 119 | ||
120 | #if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) | ||
121 | static const struct imxuart_platform_data uart_pdata __initconst = { | 120 | static const struct imxuart_platform_data uart_pdata __initconst = { |
122 | .flags = IMXUART_HAVE_RTSCTS, | 121 | .flags = IMXUART_HAVE_RTSCTS, |
123 | }; | 122 | }; |
@@ -134,11 +133,6 @@ static inline void mxc_init_imx_uart(void) | |||
134 | mxc_iomux_setup_multiple_pins(uart_pins, ARRAY_SIZE(uart_pins), "uart-0"); | 133 | mxc_iomux_setup_multiple_pins(uart_pins, ARRAY_SIZE(uart_pins), "uart-0"); |
135 | imx31_add_imx_uart0(&uart_pdata); | 134 | imx31_add_imx_uart0(&uart_pdata); |
136 | } | 135 | } |
137 | #else /* !SERIAL_IMX */ | ||
138 | static inline void mxc_init_imx_uart(void) | ||
139 | { | ||
140 | } | ||
141 | #endif /* !SERIAL_IMX */ | ||
142 | 136 | ||
143 | static void mx31ads_expio_irq_handler(u32 irq, struct irq_desc *desc) | 137 | static void mx31ads_expio_irq_handler(u32 irq, struct irq_desc *desc) |
144 | { | 138 | { |