summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/irq.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-02-01 19:38:49 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-02-01 19:38:49 +0900
commit17292ecc07857bb16737c340dda289ab9d219e05 (patch)
tree214a208af0e4826b835cd4ee770c7f1573c86b04 /arch/arm/mach-omap1/irq.c
parentcd7bb53ff88a5acef942a87c1d04e6211b6470dc (diff)
parent0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff)
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'arch/arm/mach-omap1/irq.c')
-rw-r--r--arch/arm/mach-omap1/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 47701584df3..731dd33bff5 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)