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-mx25 | |
| parent | 1fd317076caf1ee22ddb6a7853a0ca462f0233c5 (diff) | |
| parent | 14f0f512ba6f4eccc9b7cf67be47439ed2917afb (diff) | |
| download | linux-b6d17c1a8e64e8b7f58dde3d353de664a492908a.tar.bz2 | |
Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx25')
| -rw-r--r-- | arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx25/mach-cpuimx25.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c index 91931dcb0689..4aaadc753d3e 100644 --- a/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c +++ b/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c @@ -215,7 +215,7 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata = { * Add platform devices present on this baseboard and init * them from CPU side as far as required to use them later on */ -void __init eukrea_mbimxsd_baseboard_init(void) +void __init eukrea_mbimxsd25_baseboard_init(void) { if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads, ARRAY_SIZE(eukrea_mbimxsd_pads))) 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) if (!otg_mode_host) mxc_register_device(&otg_udc_device, &otg_device_pdata); -#ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD - eukrea_mbimxsd_baseboard_init(); +#ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD + eukrea_mbimxsd25_baseboard_init(); #endif } |