diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /include/asm-arm/arch-mxc/irqs.h | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'include/asm-arm/arch-mxc/irqs.h')
| -rw-r--r-- | include/asm-arm/arch-mxc/irqs.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/asm-arm/arch-mxc/irqs.h b/include/asm-arm/arch-mxc/irqs.h index b2c5205e1962..f416130718cf 100644 --- a/include/asm-arm/arch-mxc/irqs.h +++ b/include/asm-arm/arch-mxc/irqs.h | |||
| @@ -13,17 +13,4 @@ | |||
| 13 | 13 | ||
| 14 | #include <asm/hardware.h> | 14 | #include <asm/hardware.h> |
| 15 | 15 | ||
| 16 | #define MXC_IRQ_TO_EXPIO(irq) ((irq) - MXC_EXP_IO_BASE) | ||
| 17 | |||
| 18 | #define MXC_IRQ_TO_GPIO(irq) ((irq) - MXC_GPIO_INT_BASE) | ||
| 19 | #define MXC_GPIO_TO_IRQ(x) (MXC_GPIO_INT_BASE + x) | ||
| 20 | |||
| 21 | /* Number of normal interrupts */ | ||
| 22 | #define NR_IRQS (MXC_MAX_INT_LINES + \ | ||
| 23 | MXC_MAX_GPIO_LINES + \ | ||
| 24 | MXC_MAX_VIRTUAL_INTS) | ||
| 25 | |||
| 26 | /* Number of fast interrupts */ | ||
| 27 | #define NR_FIQS MXC_MAX_INTS | ||
| 28 | |||
| 29 | #endif /* __ASM_ARCH_MXC_IRQS_H__ */ | 16 | #endif /* __ASM_ARCH_MXC_IRQS_H__ */ |