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 'devel-stable' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-integrator
/
core.c
diff --git
a/arch/arm/mach-integrator/core.c
b/arch/arm/mach-integrator/core.c
index 15b87f26ac963567f396532055eccbae42af15b1..304dfb2b346a9d8900c70cbfc539b18d65514c1a 100644
(file)
--- a/
arch/arm/mach-integrator/core.c
+++ b/
arch/arm/mach-integrator/core.c
@@
-25,8
+25,9
@@
#include <mach/hardware.h>
#include <mach/platform.h>
-#include <asm/irq.h>
#include <mach/cm.h>
+#include <mach/irqs.h>
+
#include <asm/system.h>
#include <asm/leds.h>
#include <asm/mach-types.h>