diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
| commit | bea15fd77ffa1338c293328b8c74a120be53e861 (patch) | |
| tree | be8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-shmobile/include | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 72ee8499eb27f5724ac97b147350a5457a598aa3 (diff) | |
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-shmobile/include')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/irqs.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h index dcb714f4d75a..4e686cc201fc 100644 --- a/arch/arm/mach-shmobile/include/mach/irqs.h +++ b/arch/arm/mach-shmobile/include/mach/irqs.h | |||
| @@ -1,15 +1,11 @@ | |||
| 1 | #ifndef __ASM_MACH_IRQS_H | 1 | #ifndef __ASM_MACH_IRQS_H |
| 2 | #define __ASM_MACH_IRQS_H | 2 | #define __ASM_MACH_IRQS_H |
| 3 | 3 | ||
| 4 | #define NR_IRQS 1024 | 4 | #include <linux/sh_intc.h> |
| 5 | 5 | ||
| 6 | /* GIC */ | 6 | /* GIC */ |
| 7 | #define gic_spi(nr) ((nr) + 32) | 7 | #define gic_spi(nr) ((nr) + 32) |
| 8 | 8 | ||
| 9 | /* INTCA */ | ||
| 10 | #define evt2irq(evt) (((evt) >> 5) - 16) | ||
| 11 | #define irq2evt(irq) (((irq) + 16) << 5) | ||
| 12 | |||
| 13 | /* INTCS */ | 9 | /* INTCS */ |
| 14 | #define INTCS_VECT_BASE 0x2200 | 10 | #define INTCS_VECT_BASE 0x2200 |
| 15 | #define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect)) | 11 | #define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect)) |