linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/13] ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs
Date: Thu, 27 Jan 2011 14:00:29 +0100	[thread overview]
Message-ID: <1296133233-1062-10-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1296133233-1062-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-mx5/board-mx51_3ds.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c
index 8a0619b..feb2800 100644
--- a/arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/arch/arm/mach-mx5/board-mx51_3ds.c
@@ -71,22 +71,13 @@ 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[] = {
@@ -161,7 +152,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,
-- 
1.7.2.3

  parent reply	other threads:[~2011-01-27 13:00 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-27 13:00 i.MX unnecessary ifdef removal Sascha Hauer
2011-01-27 13:00 ` [PATCH 01/13] ARM i.MX35 pcm043: remove unnecessary CONFIG_I2C ifdefs Sascha Hauer
2011-01-27 13:00 ` [PATCH 02/13] ARM i.MX35 pcm043: put usbh1 outside CONFIG_USB_ULPI Sascha Hauer
2011-01-27 13:00 ` [PATCH 03/13] ARM i.MX31 mx31ads: remove unnecessary CONFIG_I2C ifdefs Sascha Hauer
2011-01-27 13:00 ` [PATCH 04/13] ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_IMX ifdefs Sascha Hauer
2011-01-27 13:00 ` [PATCH 05/13] ARM i.MX31 mx31ads: remove unnecessary CONFIG_SERIAL_8250 ifdefs Sascha Hauer
2011-01-27 13:00 ` [PATCH 06/13] ARM i.MX27 pca100: remove unnecessary CONFIG_SPI_IMX ifdefs Sascha Hauer
2011-01-27 13:00 ` [PATCH 07/13] ARM i.MX27 eukrea mbimx27: " Sascha Hauer
2011-01-27 13:00 ` [PATCH 08/13] ARM i.MX31 pcm037 eet: " Sascha Hauer
2011-01-27 13:00 ` Sascha Hauer [this message]
2011-01-27 13:26   ` [PATCH 09/13] ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs Sergei Shtylyov
2011-01-27 13:00 ` [PATCH 10/13] ARM i.MX51 mx51 babbage: " Sascha Hauer
2011-01-27 13:00 ` [PATCH 11/13] ARM i.MX51 mx51 babbage: remove unnecessary CONFIG_KEYBOARD_IMX ifdefs Sascha Hauer
2011-01-27 13:16   ` Fabio Estevam
2011-01-27 13:00 ` [PATCH 12/13] ARM i.MX51 cpuimx51: remove unnecessary CONFIG_SERIAL_8250 ifdefs Sascha Hauer
2011-01-27 13:00 ` [PATCH 13/13] ARM i.MX51 efikamx: remove unnecessary CONFIG_SERIAL_IMX ifdefs Sascha Hauer
2011-01-27 13:48   ` Arnaud Patard (Rtp)
2011-01-27 14:04     ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1296133233-1062-10-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).