ARM i.MX51 efikamx: remove unnecessary CONFIG_SERIAL_IMX ifdefs

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

diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
index b7946f8e8d4048ae73f25e34caf76dd1f235aabb..e23704044eb0faf77bec8cebfb1fd8147992b9a4 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
@@ -121,23 +121,10 @@ static iomux_v3_cfg_t mx51efikamx_pads[] = {
 };
 
 /* Serial ports */
-#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
 static const struct imxuart_platform_data uart_pdata = {
        .flags = IMXUART_HAVE_RTSCTS,
 };
 
-static inline void mxc_init_imx_uart(void)
-{
-       imx51_add_imx_uart(0, &uart_pdata);
-       imx51_add_imx_uart(1, &uart_pdata);
-       imx51_add_imx_uart(2, &uart_pdata);
-}
-#else /* !SERIAL_IMX */
-static inline void mxc_init_imx_uart(void)
-{
-}
-#endif /* SERIAL_IMX */
-
 /* This function is board specific as the bit mask for the plldiv will also
  * be different for other Freescale SoCs, thus a common bitmask is not
  * possible and cannot get place in /plat-mxc/ehci.c.
@@ -320,7 +307,9 @@ static void __init mxc_board_init(void)
                                        ARRAY_SIZE(mx51efikamx_pads));
        mx51_efikamx_board_id();
        mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config);
-       mxc_init_imx_uart();
+       imx51_add_imx_uart(0, &uart_pdata);
+       imx51_add_imx_uart(1, &uart_pdata);
+       imx51_add_imx_uart(2, &uart_pdata);
        imx51_add_sdhci_esdhc_imx(0, NULL);
 
        /* on < 1.2 boards both SD controllers are used */