diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 10:08:50 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 10:08:50 +0100 |
commit | b6d17c1a8e64e8b7f58dde3d353de664a492908a (patch) | |
tree | 160c175e9c3ab65a7221effadee78eba24e7d2f4 /arch/arm/mach-mx3/mach-cpuimx35.c | |
parent | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 (diff) | |
parent | ARM: imx: set cache line size to 64 bytes for i.MX5 (diff) | |
download | linux-dev-b6d17c1a8e64e8b7f58dde3d353de664a492908a.tar.xz linux-dev-b6d17c1a8e64e8b7f58dde3d353de664a492908a.zip |
Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx3/mach-cpuimx35.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-cpuimx35.c | 4 |
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 9770a6a973be..2a4f8b781ba4 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 } |