diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-15 15:07:40 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-15 15:07:40 +0000 |
| commit | 4ba9dcbeba042b7a1a1366f0dc683a2947ca5577 (patch) | |
| tree | a99a7e26eb4c30a477d70b035b5a90f2dfd45566 /include/asm-arm/hardware | |
| parent | 382266ad5ad4119ec12df889afa5062a0a0cd6ae (diff) | |
| parent | 4b17244c133689ad0cbdca37ce3e15068f120428 (diff) | |
Merge Realview GIC code
Diffstat (limited to 'include/asm-arm/hardware')
| -rw-r--r-- | include/asm-arm/hardware/arm_scu.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/hardware/gic.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-arm/hardware/arm_scu.h b/include/asm-arm/hardware/arm_scu.h index 9903f60c84b7..7d28eb5a1758 100644 --- a/include/asm-arm/hardware/arm_scu.h +++ b/include/asm-arm/hardware/arm_scu.h @@ -1,6 +1,8 @@ #ifndef ASMARM_HARDWARE_ARM_SCU_H #define ASMARM_HARDWARE_ARM_SCU_H +#include <asm/arch/scu.h> + /* * SCU registers */ diff --git a/include/asm-arm/hardware/gic.h b/include/asm-arm/hardware/gic.h index 3fa5eb70f64e..966e428ad32c 100644 --- a/include/asm-arm/hardware/gic.h +++ b/include/asm-arm/hardware/gic.h @@ -33,8 +33,9 @@ #define GIC_DIST_SOFTINT 0xf00 #ifndef __ASSEMBLY__ -void gic_dist_init(void __iomem *base); -void gic_cpu_init(void __iomem *base); +void gic_dist_init(unsigned int gic_nr, void __iomem *base, unsigned int irq_start); +void gic_cpu_init(unsigned int gic_nr, void __iomem *base); +void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); void gic_raise_softirq(cpumask_t cpumask, unsigned int irq); #endif |