diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 11:30:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 14:32:43 +0100 |
| commit | 0c1c8511a39ac980921e1c06b3f5809c7a42b522 (patch) | |
| tree | d7e3b72b44f5254d37adf8966aaaebcdd7cb9a78 /arch/arm/mach-mx5 | |
| parent | b49a2a69e561b7bf22f4c081d7c44aa992e51509 (diff) | |
| download | kernel_samsung_crespo-0c1c8511a39ac980921e1c06b3f5809c7a42b522.zip kernel_samsung_crespo-0c1c8511a39ac980921e1c06b3f5809c7a42b522.tar.gz kernel_samsung_crespo-0c1c8511a39ac980921e1c06b3f5809c7a42b522.tar.bz2 | |
ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_3ds.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c index 8a0619b..2f5acd0 100644 --- a/arch/arm/mach-mx5/board-mx51_3ds.c +++ b/arch/arm/mach-mx5/board-mx51_3ds.c @@ -71,23 +71,10 @@ static iomux_v3_cfg_t mx51_3ds_pads[] = { }; /* Serial ports */ -#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE) static const struct imxuart_platform_data uart_pdata __initconst = { .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 */ - #if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE) static int mx51_3ds_board_keymap[] = { KEY(0, 0, KEY_1), @@ -161,7 +148,10 @@ static void __init mxc_board_init(void) { mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads, ARRAY_SIZE(mx51_3ds_pads)); - 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_ecspi(1, &mx51_3ds_ecspi2_pdata); spi_register_board_info(mx51_3ds_spi_nor_device, |