diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 12:10:07 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 12:10:07 -0400 |
| commit | 8c31b1635b91e48f867e010cd7bcd06393e5858a (patch) | |
| tree | 4981add7e38e24724d255dedeb03f93be34d33ec /arch/arm/mach-imx/mach-mx25_3ds.c | |
| parent | 121a2dd860f8348fb014b660f133a0cb9a16273e (diff) | |
| parent | 2ce420da39078a6135d1c004a0e4436fdc1458b4 (diff) | |
Merge branch 'gpio/next-mx' into gpio/next
Diffstat (limited to 'arch/arm/mach-imx/mach-mx25_3ds.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx25_3ds.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c index 58ea3fdf0911..01534bb61305 100644 --- a/arch/arm/mach-imx/mach-mx25_3ds.c +++ b/arch/arm/mach-imx/mach-mx25_3ds.c | |||
| @@ -219,6 +219,8 @@ static const struct esdhc_platform_data mx25pdk_esdhc_pdata __initconst = { | |||
| 219 | 219 | ||
| 220 | static void __init mx25pdk_init(void) | 220 | static void __init mx25pdk_init(void) |
| 221 | { | 221 | { |
| 222 | imx25_soc_init(); | ||
| 223 | |||
| 222 | mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads, | 224 | mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads, |
| 223 | ARRAY_SIZE(mx25pdk_pads)); | 225 | ARRAY_SIZE(mx25pdk_pads)); |
| 224 | 226 | ||