diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/asm-xtensa/irq.h | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-xtensa/irq.h')
| -rw-r--r-- | include/asm-xtensa/irq.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-xtensa/irq.h b/include/asm-xtensa/irq.h index 049fde7e752d..fc73b7f11aff 100644 --- a/include/asm-xtensa/irq.h +++ b/include/asm-xtensa/irq.h | |||
| @@ -12,8 +12,7 @@ | |||
| 12 | #define _XTENSA_IRQ_H | 12 | #define _XTENSA_IRQ_H |
| 13 | 13 | ||
| 14 | #include <asm/platform/hardware.h> | 14 | #include <asm/platform/hardware.h> |
| 15 | 15 | #include <asm/variant/core.h> | |
| 16 | #include <xtensa/config/core.h> | ||
| 17 | 16 | ||
| 18 | #ifndef PLATFORM_NR_IRQS | 17 | #ifndef PLATFORM_NR_IRQS |
| 19 | # define PLATFORM_NR_IRQS 0 | 18 | # define PLATFORM_NR_IRQS 0 |
| @@ -27,10 +26,5 @@ static __inline__ int irq_canonicalize(int irq) | |||
| 27 | } | 26 | } |
| 28 | 27 | ||
| 29 | struct irqaction; | 28 | struct irqaction; |
| 30 | #if 0 // FIXME | ||
| 31 | extern void disable_irq_nosync(unsigned int); | ||
| 32 | extern void disable_irq(unsigned int); | ||
| 33 | extern void enable_irq(unsigned int); | ||
| 34 | #endif | ||
| 35 | 29 | ||
| 36 | #endif /* _XTENSA_IRQ_H */ | 30 | #endif /* _XTENSA_IRQ_H */ |