summaryrefslogtreecommitdiff
path: root/arch/arm/mach-spear3xx/spear3xx.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-12 17:00:03 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-12 17:39:02 +0100
commit5447521094b2948ee96aa61e110e3955ad88057c (patch)
tree414b7007790694cabedc23d6a7cd9dca39471a2d /arch/arm/mach-spear3xx/spear3xx.c
parent17dd1094e49199c1b681e0dcd337547dbb2e3270 (diff)
ARM: spear: unify mach/generic.h and mach/irqs.h
These are indeed easy to combine, as there are no conflicting definitions in generic.h, and irqs.h will be obsolete once we enable SPARSE_IRQ. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/mach-spear3xx/spear3xx.c')
-rw-r--r--arch/arm/mach-spear3xx/spear3xx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index f9d754f90c59..72e3ae7d463a 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -14,8 +14,10 @@
#define pr_fmt(fmt) "SPEAr3xx: " fmt
#include <linux/amba/pl022.h>
-#include <linux/amba/pl08x.h>
+#include <linux/amba/pl080.h>
+#include <linux/clk.h>
#include <linux/io.h>
+#include <asm/mach/map.h>
#include <plat/pl080.h>
#include <mach/generic.h>
#include <mach/spear.h>