diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 12:00:03 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 12:39:02 -0400 |
| commit | 5447521094b2948ee96aa61e110e3955ad88057c (patch) | |
| tree | 414b7007790694cabedc23d6a7cd9dca39471a2d /arch/arm/mach-spear3xx/spear3xx.c | |
| parent | 17dd1094e49199c1b681e0dcd337547dbb2e3270 (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.c | 4 |
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 @@ | |||
| 14 | #define pr_fmt(fmt) "SPEAr3xx: " fmt | 14 | #define pr_fmt(fmt) "SPEAr3xx: " fmt |
| 15 | 15 | ||
| 16 | #include <linux/amba/pl022.h> | 16 | #include <linux/amba/pl022.h> |
| 17 | #include <linux/amba/pl08x.h> | 17 | #include <linux/amba/pl080.h> |
| 18 | #include <linux/clk.h> | ||
| 18 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <asm/mach/map.h> | ||
| 19 | #include <plat/pl080.h> | 21 | #include <plat/pl080.h> |
| 20 | #include <mach/generic.h> | 22 | #include <mach/generic.h> |
| 21 | #include <mach/spear.h> | 23 | #include <mach/spear.h> |