diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 10:10:07 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 10:10:07 -0600 |
commit | 8c31b1635b91e48f867e010cd7bcd06393e5858a (patch) | |
tree | 4981add7e38e24724d255dedeb03f93be34d33ec /arch/arm/mach-imx/mach-vpr200.c | |
parent | 121a2dd860f8348fb014b660f133a0cb9a16273e (diff) | |
parent | 2ce420da39078a6135d1c004a0e4436fdc1458b4 (diff) |
Merge branch 'gpio/next-mx' into gpio/next
Diffstat (limited to 'arch/arm/mach-imx/mach-vpr200.c')
-rw-r--r-- | arch/arm/mach-imx/mach-vpr200.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c index d74e3473d23..7d8e012a633 100644 --- a/arch/arm/mach-imx/mach-vpr200.c +++ b/arch/arm/mach-imx/mach-vpr200.c @@ -267,6 +267,8 @@ static struct platform_device *devices[] __initdata = { */ static void __init vpr200_board_init(void) { + imx35_soc_init(); + mxc_iomux_v3_setup_multiple_pads(vpr200_pads, ARRAY_SIZE(vpr200_pads)); imx35_add_fec(NULL); |