summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mach-cpuimx35.c
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-07-30 22:58:40 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-08-16 13:30:35 +0200
commitec53fe3d655befce6420a1b8485af9b1145a0c90 (patch)
treed129e03535f7fbc55ce5e9946d1043632dceb737 /arch/arm/mach-mx3/mach-cpuimx35.c
parentda5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff)
downloadblackbird-op-linux-ec53fe3d655befce6420a1b8485af9b1145a0c90.tar.gz
blackbird-op-linux-ec53fe3d655befce6420a1b8485af9b1145a0c90.zip
eukrea-baseboards: fix the merge in one file
Last change I did made a big mess in function names and CONFIG names, this patch fixes this so that the baseboard support is really built when selected. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-cpuimx35.c')
-rw-r--r--arch/arm/mach-mx3/mach-cpuimx35.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-mx3/mach-cpuimx35.c
index 63f970f340a2..e4268bbb8fbc 100644
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-mx3/mach-cpuimx35.c
@@ -201,8 +201,8 @@ static void __init mxc_board_init(void)
if (!otg_mode_host)
mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata);
-#ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD
- eukrea_mbimxsd_baseboard_init();
+#ifdef CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD
+ eukrea_mbimxsd35_baseboard_init();
#endif
}
OpenPOWER on IntegriCloud