aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-08-09 09:45:09 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-11-15 09:25:03 +0100
commit8cad8fa1d716b16aa22d5c670ead2b952e1e59b9 (patch)
treef7ebea8f9fa93adeb8d97aa48777de8f21d7dcec /arch/arm/mach-mx3
parent415d34195b3c0c26544034d37b8766dfffd36bcf (diff)
downloadkernel_samsung_crespo-8cad8fa1d716b16aa22d5c670ead2b952e1e59b9.zip
kernel_samsung_crespo-8cad8fa1d716b16aa22d5c670ead2b952e1e59b9.tar.gz
kernel_samsung_crespo-8cad8fa1d716b16aa22d5c670ead2b952e1e59b9.tar.bz2
ARM i.MX pcm037 eet: compile fixes
The pcm037 eet extension currently does not compile if SPI_IMX is enabled. Fix it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/mach-pcm037_eet.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037_eet.c b/arch/arm/mach-mx3/mach-pcm037_eet.c
index 3392812..fda5654 100644
--- a/arch/arm/mach-mx3/mach-pcm037_eet.c
+++ b/arch/arm/mach-mx3/mach-pcm037_eet.c
@@ -14,6 +14,7 @@
#include <mach/common.h>
#include <mach/iomux-mx3.h>
+#include <mach/spi.h>
#include <asm/mach-types.h>
@@ -59,14 +60,12 @@ static struct spi_board_info pcm037_spi_dev[] = {
};
/* Platform Data for MXC CSPI */
-#if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
static int pcm037_spi1_cs[] = {MXC_SPI_CS(1), IOMUX_TO_GPIO(MX31_PIN_KEY_COL7)};
static const struct spi_imx_master pcm037_spi1_pdata __initconst = {
.chipselect = pcm037_spi1_cs,
.num_chipselect = ARRAY_SIZE(pcm037_spi1_cs),
};
-#endif
/* GPIO-keys input device */
static struct gpio_keys_button pcm037_gpio_keys[] = {