summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/timer.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-05-20 09:01:21 -0700
committerTony Lindgren <tony@atomide.com>2015-05-20 09:01:21 -0700
commit685e2d08c54b1a1bf31bbe6562f06db089d31c7b (patch)
tree5076e95abb7ebdf6c23dc44a446c49d14dc404b9 /arch/arm/mach-omap1/timer.c
parentb694331cfb2ec3bc2225a0ea9fddbb7e24d81c37 (diff)
ARM: OMAP1: Change interrupt numbering for sparse IRQ
Change interrupt numbering for sparse IRQ. We do this using a fixed offset until we can drop irqs.h once all it's users have been updated. Note that this depends on the GPIO fix for the MPUIO IRQs "gpio: omap: Fix regression for MPUIO interrupts". Also note that this patch adds some extra irq alloc warnings that will go away when we stop calling irq_alloc_descs in gpio-omap.c with a follow-up patch. Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/timer.c')
-rw-r--r--arch/arm/mach-omap1/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index bde7a35e5000..06c5ba7574a5 100644
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -27,10 +27,10 @@
#include <linux/platform_device.h>
#include <linux/platform_data/dmtimer-omap.h>
-#include <mach/irqs.h>
-
#include <plat/dmtimer.h>
+#include "soc.h"
+
#define OMAP1610_GPTIMER1_BASE 0xfffb1400
#define OMAP1610_GPTIMER2_BASE 0xfffb1c00
#define OMAP1610_GPTIMER3_BASE 0xfffb2400