aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard (Rtp) <arnaud.patard@rtp-net.org>2010-11-26 09:27:53 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2010-12-03 05:05:11 -0500
commit0ef51953be84cf910cdf5d9a6b8ccb75fd3dd10c (patch)
tree385c7afd0ef6476891bb2c8ba77f15d2b917db0e
parent4c6c32b3f856346158161a8c9824b4dd2bff0893 (diff)
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/Kconfig4
-rw-r--r--arch/arm/mach-mx5/board-mx51_efikamx.c4
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
23 23
24config MACH_MX51_3DS 24config MACH_MX51_3DS
25 bool "Support MX51PDK (3DS)" 25 bool "Support MX51PDK (3DS)"
26 select IMX_HAVE_PLATFORM_ESDHC
27 select IMX_HAVE_PLATFORM_IMX_UART 26 select IMX_HAVE_PLATFORM_IMX_UART
27 select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
28 select IMX_HAVE_PLATFORM_SPI_IMX 28 select IMX_HAVE_PLATFORM_SPI_IMX
29 select MXC_DEBUG_BOARD 29 select MXC_DEBUG_BOARD
30 help 30 help
@@ -83,8 +83,8 @@ endchoice
83 83
84config MACH_MX51_EFIKAMX 84config MACH_MX51_EFIKAMX
85 bool "Support MX51 Genesi Efika MX nettop" 85 bool "Support MX51 Genesi Efika MX nettop"
86 select IMX_HAVE_PLATFORM_ESDHC
87 select IMX_HAVE_PLATFORM_IMX_UART 86 select IMX_HAVE_PLATFORM_IMX_UART
87 select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
88 select IMX_HAVE_PLATFORM_SPI_IMX 88 select IMX_HAVE_PLATFORM_SPI_IMX
89 help 89 help
90 Include support for Genesi Efika MX nettop. This includes specific 90 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)
319 mx51_efikamx_board_id(); 319 mx51_efikamx_board_id();
320 mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config); 320 mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config);
321 mxc_init_imx_uart(); 321 mxc_init_imx_uart();
322 imx51_add_esdhc(0, NULL); 322 imx51_add_sdhci_esdhc_imx(0, NULL);
323 323
324 /* on < 1.2 boards both SD controllers are used */ 324 /* on < 1.2 boards both SD controllers are used */
325 if (system_rev < 0x12) { 325 if (system_rev < 0x12) {
326 imx51_add_esdhc(1, NULL); 326 imx51_add_sdhci_esdhc_imx(1, NULL);
327 mx51_efikamx_leds[2].default_trigger = "mmc1"; 327 mx51_efikamx_leds[2].default_trigger = "mmc1";
328 } 328 }
329 329