diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 22:27:55 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 22:27:55 (GMT) |
commit | 35a8524ffe84667e805b9249316e729e050c83b2 (patch) | |
tree | b995e1adde02732f9d462a2097a09b7cddac7bf7 /arch/arm/mach-omap1/include/mach/entry-macro.S | |
parent | ffbbf2da9e578dc7b7ae4f945412c4b74f54b20e (diff) | |
parent | 0e6d8cad448bde3d846961bb43db15daae94562e (diff) | |
download | linux-fsl-qoriq-35a8524ffe84667e805b9249316e729e050c83b2.tar.xz |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
arm: omap2: mux: fix compile warning
omap1: Simplify use of omap_irq_flags
omap2+: Fix unused variable warning for omap_irq_base
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/entry-macro.S')
-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 c9be6d4..bfb4fb1 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 |