diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-27 15:52:16 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-27 15:52:16 -0800 |
| commit | efe318a333767cbd20746f8d57f3ca7e398d9255 (patch) | |
| tree | 731233b6921794dfc8e6e53e7f2d3d887ea26c34 /arch/arm/mach-omap1/irq.c | |
| parent | 9f9605c2eda9679e6f63c605cbd9cbf6a9a7f3fa (diff) | |
| download | talos-obmc-linux-efe318a333767cbd20746f8d57f3ca7e398d9255.tar.gz talos-obmc-linux-efe318a333767cbd20746f8d57f3ca7e398d9255.zip | |
omap1: Simplify use of omap_irq_flags
Commit 03a9e5126147c9f92aeba4b34f62b15b625087fb
(omap1: Use asm_irq_flags for entry-macro.S) added support
for multi-omap builds with addition of the omap_irq_flags.
Commit 9f9605c2eda9679e6f63c605cbd9cbf6a9a7f3fa
(omap2+: Fix unused variable warning for omap_irq_base)
simplified omap2+ entry-macro.S by moving omap_irq_flags
out of entry-macro.S.
Simplify omap1 entry-macro.S in a similar way to keep the
code consistent. Based on a similar earlier patch for omap2+
by Russell King <rmk+kernel@arm.linux.org.uk>.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/irq.c')
| -rw-r--r-- | arch/arm/mach-omap1/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index 47701584df35..731dd33bff51 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c @@ -57,6 +57,7 @@ struct omap_irq_bank { unsigned long wake_enable; }; +u32 omap_irq_flags; static unsigned int irq_bank_count; static struct omap_irq_bank *irq_banks; @@ -176,7 +177,6 @@ static struct irq_chip omap_irq_chip = { void __init omap_init_irq(void) { - extern unsigned int omap_irq_flags; int i, j; #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) |
