From: Eric Bénard Date: Mon, 19 Jul 2010 07:45:17 +0000 (+0200) Subject: eukrea_mbimx27-baseboard: fix compile when CONFIG_SPI_IMX is disabled X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5055d1efc0cb4bd612c78af8fa61316ae49755a9;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Signed-off-by: Sascha Hauer --- diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index 27e7226ec9d..4edc5f43920 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, };