Skip to content

Commit

Permalink
ARM i.MX pcm037 eet: compile fixes
Browse files Browse the repository at this point in the history
The pcm037 eet extension currently does not compile if
SPI_IMX is enabled. Fix it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Sascha Hauer committed Nov 15, 2010
1 parent 415d341 commit 8cad8fa
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/arm/mach-mx3/mach-pcm037_eet.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <mach/common.h>
#include <mach/iomux-mx3.h>
#include <mach/spi.h>

#include <asm/mach-types.h>

Expand Down Expand Up @@ -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[] = {
Expand Down

0 comments on commit 8cad8fa

Please sign in to comment.