diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 12:38:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 12:38:31 -0700 |
| commit | f39cf0b783b3f402ddf1eb6a09234b5bfe34bb2a (patch) | |
| tree | 6ac105287f433be5be65b14f1246a23e368c3ae2 /arch/xtensa/include/asm/irq.h | |
| parent | 59ef7a83f1127038a433464597df02e2dc9540e7 (diff) | |
| parent | aafd1255d08fb26cab87d1b28ff35a15bdb2ed68 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: enable m41t80 driver in s6105_defconfig
xtensa: add m41t62 rtc to s6105 platform
xtensa: enable s6gmac in s6105_defconfig
xtensa: s6105 specific configuration for s6gmac
s6gmac: xtensa s6000 on-chip ethernet driver
xtensa: support s6000 gpio irqs and alternate function selection
xtensa: s6000 dma engine support
xtensa: allow variant to initialize own irq chips
xtensa: cache inquiry and unaligned cache handling functions
Diffstat (limited to 'arch/xtensa/include/asm/irq.h')
| -rw-r--r-- | arch/xtensa/include/asm/irq.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/irq.h b/arch/xtensa/include/asm/irq.h index dfac82dc52a..4c0ccc9c4f4 100644 --- a/arch/xtensa/include/asm/irq.h +++ b/arch/xtensa/include/asm/irq.h @@ -11,6 +11,7 @@ #ifndef _XTENSA_IRQ_H #define _XTENSA_IRQ_H +#include <linux/init.h> #include <platform/hardware.h> #include <variant/core.h> @@ -21,11 +22,20 @@ static inline void variant_irq_enable(unsigned int irq) { } static inline void variant_irq_disable(unsigned int irq) { } #endif +#ifndef VARIANT_NR_IRQS +# define VARIANT_NR_IRQS 0 +#endif #ifndef PLATFORM_NR_IRQS # define PLATFORM_NR_IRQS 0 #endif #define XTENSA_NR_IRQS XCHAL_NUM_INTERRUPTS -#define NR_IRQS (XTENSA_NR_IRQS + PLATFORM_NR_IRQS) +#define NR_IRQS (XTENSA_NR_IRQS + VARIANT_NR_IRQS + PLATFORM_NR_IRQS) + +#if VARIANT_NR_IRQS == 0 +static inline void variant_init_irq(void) { } +#else +void variant_init_irq(void) __init; +#endif static __inline__ int irq_canonicalize(int irq) { |