diff options
| author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2010-11-26 15:27:53 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-03 11:05:11 +0100 |
| commit | 0ef51953be84cf910cdf5d9a6b8ccb75fd3dd10c (patch) | |
| tree | 385c7afd0ef6476891bb2c8ba77f15d2b917db0e | |
| parent | 4c6c32b3f856346158161a8c9824b4dd2bff0893 (diff) | |
| download | blackbird-op-linux-0ef51953be84cf910cdf5d9a6b8ccb75fd3dd10c.tar.gz blackbird-op-linux-0ef51953be84cf910cdf5d9a6b8ccb75fd3dd10c.zip | |
mx5: Fix efikamx build
Commit 124bf94a "ARM: imx: fix name for functions adding sdhci-esdhc-imx devices"
changed some devices and Kconfig entry and didn't change every places
it should have. It's breaking efikamx build. I've fixed 3ds Kconfig
entry as I believe it's broken there too.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-mx5/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_efikamx.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 88f0c66d13a7..3e48c80342a3 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -23,8 +23,8 @@ config MACH_MX51_BABBAGE config MACH_MX51_3DS bool "Support MX51PDK (3DS)" - select IMX_HAVE_PLATFORM_ESDHC select IMX_HAVE_PLATFORM_IMX_UART + select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SPI_IMX select MXC_DEBUG_BOARD help @@ -83,8 +83,8 @@ endchoice config MACH_MX51_EFIKAMX bool "Support MX51 Genesi Efika MX nettop" - select IMX_HAVE_PLATFORM_ESDHC select IMX_HAVE_PLATFORM_IMX_UART + select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SPI_IMX help Include support for Genesi Efika MX nettop. This includes specific diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c index 4b2718b3e517..3a4607bb79b5 100644 --- a/arch/arm/mach-mx5/board-mx51_efikamx.c +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c @@ -319,11 +319,11 @@ static void __init mxc_board_init(void) mx51_efikamx_board_id(); mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config); mxc_init_imx_uart(); - imx51_add_esdhc(0, NULL); + imx51_add_sdhci_esdhc_imx(0, NULL); /* on < 1.2 boards both SD controllers are used */ if (system_rev < 0x12) { - imx51_add_esdhc(1, NULL); + imx51_add_sdhci_esdhc_imx(1, NULL); mx51_efikamx_leds[2].default_trigger = "mmc1"; } |
