From 234323ba4f226d9d3d90d5c30f7883362a810a20 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 13 Aug 2012 11:35:55 +0200 Subject: ARM: u300: merge u300.c into core.c and rid headers This gets rid of the separate u300.c file in mach-u300 since it can just as well live right in core.c, then we also get rid of the broadcasted file that is not helping anyone. Put the interface to the system timer into a separate header. Signed-off-by: Linus Walleij --- arch/arm/mach-u300/timer.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-u300/timer.c') diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 56ac06d38ec1..146e81531da3 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -26,6 +26,8 @@ #include #include +#include "timer.h" + /* * APP side special timer registers * This timer contains four timers which can fire an interrupt each. -- cgit v1.2.3 From a4fe292fa75baaa9cfb1a7224614f31fcd0d9a7b Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 13 Aug 2012 13:49:45 +0200 Subject: ARM: u300: convert to sparse IRQs This converts the U300 to use sparse IRQs, which is simple now that the number of machines are reduced. Signed-off-by: Linus Walleij --- arch/arm/mach-u300/timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-u300/timer.c') diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 146e81531da3..1da10e20e996 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -17,14 +17,15 @@ #include #include #include +#include #include +#include /* Generic stuff */ #include #include #include -#include #include "timer.h" -- cgit v1.2.3