diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 16:45:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 16:45:43 +0900 |
| commit | 1ad2096c4eba144522d87541c4024b8c84e95051 (patch) | |
| tree | a149d469a4da72a7b6e6b777879b740046c4ebc9 /arch/arm/mach-mx3/mach-pcm037_eet.c | |
| parent | c4d73e7d75a54451d6e073c118ba2b8d87bd350d (diff) | |
| parent | df73af86b6e737f357aae85e0b5e621516117780 (diff) | |
Merge branch 'rmobile/mmcif' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037_eet.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm037_eet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037_eet.c b/arch/arm/mach-mx3/mach-pcm037_eet.c index 99e0894e07d..fda56545d2f 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[] = { @@ -171,7 +170,7 @@ static struct platform_device pcm037_gpio_keys_device = { }, }; -static int eet_init_devices(void) +static int __init eet_init_devices(void) { if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET) return 0; |