diff options
| author |  Russell King <rmk+kernel@arm.linux.org.uk>
| 2011-03-16 23:35:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk>
| 2011-03-16 23:35:25 +0000 |
| commit | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (patch) | |
| tree | c685060f260410e6704c9dfd457ed8c347141f1d /arch/arm/include/asm/hardware | |
| parent | Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', '... (diff) | |
| parent | ARM: 6806/1: irq: introduce entry and exit functions for chained handlers (diff) | |
| download | linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.tar.gz linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.tar.bz2 linux-1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/include/asm/hardware')
| -rw-r--r-- | arch/arm/include/asm/hardware/gic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h index 84557d321001..0691f9dcc500 100644 --- a/arch/arm/include/asm/hardware/gic.h +++ b/arch/arm/include/asm/hardware/gic.h @@ -34,6 +34,7 @@ #ifndef __ASSEMBLY__ extern void __iomem *gic_cpu_base_addr; +extern struct irq_chip gic_arch_extn; void gic_init(unsigned int, unsigned int, void __iomem *, void __iomem *); void gic_secondary_init(unsigned int); |