From b4fdbd8fcb1e34a1f441d9860d54ac0b1d2801de Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 27 Jan 2011 15:52:16 -0800 Subject: [PATCH] --- yaml --- r: 232673 b: refs/heads/master c: efe318a333767cbd20746f8d57f3ca7e398d9255 h: refs/heads/master i: 232671: a0477103f054b391e95218514361ca65e1ad5fa3 v: v3 --- [refs] | 2 +- .../arch/arm/mach-omap1/include/mach/entry-macro.S | 13 ------------- trunk/arch/arm/mach-omap1/irq.c | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index c654647db71b..039329d79917 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f9605c2eda9679e6f63c605cbd9cbf6a9a7f3fa +refs/heads/master: efe318a333767cbd20746f8d57f3ca7e398d9255 diff --git a/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S b/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S index c9be6d4d83e2..bfb4fb1d7382 100644 --- a/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S +++ b/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S @@ -14,19 +14,6 @@ #include #include -/* - * We use __glue to avoid errors with multiple definitions of - * .globl omap_irq_flags as it's included from entry-armv.S but not - * from entry-common.S. - */ -#ifdef __glue - .pushsection .data - .globl omap_irq_flags -omap_irq_flags: - .word 0 - .popsection -#endif - .macro disable_fiq .endm diff --git a/trunk/arch/arm/mach-omap1/irq.c b/trunk/arch/arm/mach-omap1/irq.c index 47701584df35..731dd33bff51 100644 --- a/trunk/arch/arm/mach-omap1/irq.c +++ b/trunk/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)