projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-sa1100
/
pleb.c
diff --git
a/arch/arm/mach-sa1100/pleb.c
b/arch/arm/mach-sa1100/pleb.c
index 1602575a0d5c47f8c3be09387f1fff63c737e41e..37fe0a0a53692951db7335c05eb5249419e1d010 100644
(file)
--- a/
arch/arm/mach-sa1100/pleb.c
+++ b/
arch/arm/mach-sa1100/pleb.c
@@
-135,5
+135,6
@@
MACHINE_START(PLEB, "PLEB")
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.init_machine = pleb_init,
+ .init_late = sa11x0_init_late,
.restart = sa11x0_restart,
MACHINE_END