summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-07-19 09:45:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-07-26 15:05:20 +0200
commit5055d1efc0cb4bd612c78af8fa61316ae49755a9 (patch)
treef27764f9adfdb7e04c7f305ed40e776ce5af5088 /arch
parent7a2bb23c149e9f093b2b83c16c25991e32ef4ec3 (diff)
downloadop-kernel-dev-5055d1efc0cb4bd612c78af8fa61316ae49755a9.zip
op-kernel-dev-5055d1efc0cb4bd612c78af8fa61316ae49755a9.tar.gz
eukrea_mbimx27-baseboard: fix compile when CONFIG_SPI_IMX is disabled
the i2c_board_info structure landed into the SPI #if/#endif which is wrong. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/eukrea_mbimx27-baseboard.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
index 27e7226..4edc5f4 100644
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
@@ -289,12 +289,6 @@ static struct spi_board_info eukrea_mbimx27_spi_board_info[] __initdata = {
},
};
-static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = {
- {
- I2C_BOARD_INFO("tlv320aic23", 0x1a),
- },
-};
-
static int eukrea_mbimx27_spi_cs[] = {GPIO_PORTD | 28};
static const struct spi_imx_master eukrea_mbimx27_spi0_data __initconst = {
@@ -303,6 +297,12 @@ static const struct spi_imx_master eukrea_mbimx27_spi0_data __initconst = {
};
#endif
+static struct i2c_board_info eukrea_mbimx27_i2c_devices[] = {
+ {
+ I2C_BOARD_INFO("tlv320aic23", 0x1a),
+ },
+};
+
static struct platform_device *platform_devices[] __initdata = {
&leds_gpio,
};
OpenPOWER on IntegriCloud