git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-cns3xxx
/
core.c
diff --git
a/arch/arm/mach-cns3xxx/core.c
b/arch/arm/mach-cns3xxx/core.c
index f85449a6accd9210544952b6f2ce9939f5bed1da..4e9837ded96dbd7deda10dbfc3fd5e502c37b4f7 100644
(file)
--- a/
arch/arm/mach-cns3xxx/core.c
+++ b/
arch/arm/mach-cns3xxx/core.c
@@
-404,5
+404,6
@@
DT_MACHINE_START(CNS3XXX_DT, "Cavium Networks CNS3xxx")
.init_irq = cns3xxx_init_irq,
.init_time = cns3xxx_timer_init,
.init_machine = cns3xxx_init,
+ .init_late = cns3xxx_pcie_init_late,
.restart = cns3xxx_restart,
MACHINE_END