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-mx3/mach-cpuimx35.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-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) | |||
| 201 | if (!otg_mode_host) | 201 | if (!otg_mode_host) |
| 202 | mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); | 202 | mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); |
| 203 | 203 | ||
| 204 | #ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD | 204 | #ifdef CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD |
| 205 | eukrea_mbimxsd_baseboard_init(); | 205 | eukrea_mbimxsd35_baseboard_init(); |
| 206 | #endif | 206 | #endif |
| 207 | } | 207 | } |
| 208 | 208 | ||