diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 05:08:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 05:08:50 -0400 |
| commit | b6d17c1a8e64e8b7f58dde3d353de664a492908a (patch) | |
| tree | 160c175e9c3ab65a7221effadee78eba24e7d2f4 /arch/arm/mach-mx25/mach-cpuimx25.c | |
| parent | 1fd317076caf1ee22ddb6a7853a0ca462f0233c5 (diff) | |
| parent | 14f0f512ba6f4eccc9b7cf67be47439ed2917afb (diff) | |
Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx25/mach-cpuimx25.c')
| -rw-r--r-- | arch/arm/mach-mx25/mach-cpuimx25.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx25/mach-cpuimx25.c b/arch/arm/mach-mx25/mach-cpuimx25.c index a5f0174290b4..e064bb3d6919 100644 --- a/arch/arm/mach-mx25/mach-cpuimx25.c +++ b/arch/arm/mach-mx25/mach-cpuimx25.c | |||
| @@ -147,8 +147,8 @@ static void __init eukrea_cpuimx25_init(void) | |||
| 147 | if (!otg_mode_host) | 147 | if (!otg_mode_host) |
| 148 | mxc_register_device(&otg_udc_device, &otg_device_pdata); | 148 | mxc_register_device(&otg_udc_device, &otg_device_pdata); |
| 149 | 149 | ||
| 150 | #ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD | 150 | #ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD |
| 151 | eukrea_mbimxsd_baseboard_init(); | 151 | eukrea_mbimxsd25_baseboard_init(); |
| 152 | #endif | 152 | #endif |
| 153 | } | 153 | } |
| 154 | 154 | ||