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 06/13] ARM i.MX27 pca100: remove unnecessary CONFIG_SPI_IMX ifdefs
Date: Thu, 27 Jan 2011 14:00:26 +0100	[thread overview]
Message-ID: <1296133233-1062-7-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-imx/mach-pca100.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index cccc0a0..faa4e04 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -187,7 +187,6 @@ static struct i2c_board_info pca100_i2c_devices[] = {
 	}
 };
 
-#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
 static struct spi_eeprom at25320 = {
 	.name		= "at25320an",
 	.byte_len	= 4096,
@@ -211,7 +210,6 @@ static const struct spi_imx_master pca100_spi0_data __initconst = {
 	.chipselect	= pca100_spi_cs,
 	.num_chipselect = ARRAY_SIZE(pca100_spi_cs),
 };
-#endif
 
 static void pca100_ac97_warm_reset(struct snd_ac97 *ac97)
 {
@@ -389,13 +387,11 @@ static void __init pca100_init(void)
 
 	imx27_add_imx_i2c(1, &pca100_i2c1_data);
 
-#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
 	mxc_gpio_mode(GPIO_PORTD | 28 | GPIO_GPIO | GPIO_IN);
 	mxc_gpio_mode(GPIO_PORTD | 27 | GPIO_GPIO | GPIO_IN);
 	spi_register_board_info(pca100_spi_board_info,
 				ARRAY_SIZE(pca100_spi_board_info));
 	imx27_add_spi_imx0(&pca100_spi0_data);
-#endif
 
 	gpio_request(OTG_PHY_CS_GPIO, "usb-otg-cs");
 	gpio_direction_output(OTG_PHY_CS_GPIO, 1);
-- 
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 ` Sascha Hauer [this message]
2011-01-27 13:00 ` [PATCH 07/13] ARM i.MX27 eukrea mbimx27: remove unnecessary CONFIG_SPI_IMX ifdefs 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 ` [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-7-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).