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 /include | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 72ee8499eb27f5724ac97b147350a5457a598aa3 (diff) | |
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sh_intc.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h index b160645f5599..6aed0805927f 100644 --- a/include/linux/sh_intc.h +++ b/include/linux/sh_intc.h | |||
| @@ -3,6 +3,23 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/ioport.h> | 4 | #include <linux/ioport.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_SUPERH | ||
| 7 | #define INTC_NR_IRQS 512 | ||
| 8 | #else | ||
| 9 | #define INTC_NR_IRQS 1024 | ||
| 10 | #endif | ||
| 11 | |||
| 12 | /* | ||
| 13 | * Convert back and forth between INTEVT and IRQ values. | ||
| 14 | */ | ||
| 15 | #ifdef CONFIG_CPU_HAS_INTEVT | ||
| 16 | #define evt2irq(evt) (((evt) >> 5) - 16) | ||
| 17 | #define irq2evt(irq) (((irq) + 16) << 5) | ||
| 18 | #else | ||
| 19 | #define evt2irq(evt) (evt) | ||
| 20 | #define irq2evt(irq) (irq) | ||
| 21 | #endif | ||
| 22 | |||
| 6 | typedef unsigned char intc_enum; | 23 | typedef unsigned char intc_enum; |
| 7 | 24 | ||
| 8 | struct intc_vect { | 25 | struct intc_vect { |