Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / arch / arm / mach-imx / mach-bug.c

diff --git a/arch/arm/mach-imx/mach-bug.c b/arch/arm/mach-imx/mach-bug.c
index 42e4f078a19c2025c3639ca68f368d33fcab2afe..f49470553bdfb24fd49ff07440cccde06ca42354 100644 (file)
--- a/arch/arm/mach-imx/mach-bug.c
+++ b/arch/arm/mach-imx/mach-bug.c
@@ -42,6 +42,8 @@ static const unsigned int bug_pins[] __initconst = {
 
 static void __init bug_board_init(void)
 {
+       imx31_soc_init();
+
        mxc_iomux_setup_multiple_pins(bug_pins,
                                      ARRAY_SIZE(bug_pins), "uart-4");
        imx31_add_imx_uart4(&uart_pdata);