projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
mach-qong.c
diff --git
a/arch/arm/mach-imx/mach-qong.c
b/arch/arm/mach-imx/mach-qong.c
index
34df64f
..
8c2cbd6
100644
(file)
--- a/
arch/arm/mach-imx/mach-qong.c
+++ b/
arch/arm/mach-imx/mach-qong.c
@@
-251,7
+251,6
@@
static void __init qong_init(void)
mxc_init_imx_uart();
qong_init_nor_mtd();
- qong_init_fpga();
imx31_add_imx2_wdt();
}
@@
-268,5
+267,6
@@
MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
.init_irq = mx31_init_irq,
.init_time = qong_timer_init,
.init_machine = qong_init,
+ .init_late = qong_init_fpga,
.restart = mxc_restart,
MACHINE_END