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/include/mach | |
parent | 9f9605c2eda9679e6f63c605cbd9cbf6a9a7f3fa (diff) | |
download | linux-efe318a333767cbd20746f8d57f3ca7e398d9255.tar.gz linux-efe318a333767cbd20746f8d57f3ca7e398d9255.tar.bz2 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/include/mach')
-rw-r--r-- | arch/arm/mach-omap1/include/mach/entry-macro.S | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-omap1/include/mach/entry-macro.S b/arch/arm/mach-omap1/include/mach/entry-macro.S index c9be6d4d83e2..bfb4fb1d7382 100644 --- a/arch/arm/mach-omap1/include/mach/entry-macro.S +++ b/arch/arm/mach-omap1/include/mach/entry-macro.S @@ -14,19 +14,6 @@ #include <mach/irqs.h> #include <asm/hardware/gic.h> -/* - * 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 |