From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/13] ARM i.MX51 mx51 babbage: remove unnecessary CONFIG_KEYBOARD_IMX ifdefs
Date: Thu, 27 Jan 2011 14:00:31 +0100 [thread overview]
Message-ID: <1296133233-1062-12-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 | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c
index feb2800..58a2574 100644
--- a/arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/arch/arm/mach-mx5/board-mx51_3ds.c
@@ -79,7 +79,6 @@ static inline void mxc_init_imx_uart(void)
{
}
-#if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE)
static int mx51_3ds_board_keymap[] = {
KEY(0, 0, KEY_1),
KEY(0, 1, KEY_2),
@@ -115,16 +114,6 @@ static const struct matrix_keymap_data mx51_3ds_map_data __initconst = {
.keymap_size = ARRAY_SIZE(mx51_3ds_board_keymap),
};
-static void mxc_init_keypad(void)
-{
- imx51_add_imx_keypad(&mx51_3ds_map_data);
-}
-#else
-static inline void mxc_init_keypad(void)
-{
-}
-#endif
-
static int mx51_3ds_spi2_cs[] = {
MXC_SPI_CS(0),
MX51_3DS_ECSPI2_CS,
@@ -166,7 +155,7 @@ static void __init mxc_board_init(void)
"devices on the board are unusable.\n");
imx51_add_sdhci_esdhc_imx(0, NULL);
- mxc_init_keypad();
+ imx51_add_imx_keypad(&mx51_3ds_map_data);
imx51_add_imx2_wdt(0, NULL);
}
--
1.7.2.3
next prev 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 ` [PATCH 09/13] ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs Sascha Hauer
2011-01-27 13:26 ` Sergei Shtylyov
2011-01-27 13:00 ` [PATCH 10/13] ARM i.MX51 mx51 babbage: " Sascha Hauer
2011-01-27 13:00 ` Sascha Hauer [this message]
2011-01-27 13:16 ` [PATCH 11/13] ARM i.MX51 mx51 babbage: remove unnecessary CONFIG_KEYBOARD_IMX ifdefs 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-12-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).