summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ebsa110
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-02-22 22:04:41 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-22 22:04:41 +0000
commit61b80086a525c8a6081257ae40da5dee2bcaee16 (patch)
tree675da35e4c03be3a5ca17bf6430e5b51dfed6296 /arch/arm/mach-ebsa110
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff)
parent230f984662d7e0e4a9597c665fd4f53130666e7d (diff)
downloadlinux-61b80086a525c8a6081257ae40da5dee2bcaee16.tar.gz
linux-61b80086a525c8a6081257ae40da5dee2bcaee16.tar.bz2
linux-61b80086a525c8a6081257ae40da5dee2bcaee16.zip
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
Diffstat (limited to 'arch/arm/mach-ebsa110')
-rw-r--r--arch/arm/mach-ebsa110/include/mach/entry-macro.S6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ebsa110/include/mach/entry-macro.S b/arch/arm/mach-ebsa110/include/mach/entry-macro.S
index cc3e5992f6b3..14b110de78a9 100644
--- a/arch/arm/mach-ebsa110/include/mach/entry-macro.S
+++ b/arch/arm/mach-ebsa110/include/mach/entry-macro.S
@@ -12,16 +12,10 @@
#define IRQ_STAT 0xff000000 /* read */
- .macro disable_fiq
- .endm
-
.macro get_irqnr_preamble, base, tmp
mov \base, #IRQ_STAT
.endm
- .macro arch_ret_to_user, tmp1, tmp2
- .endm
-
.macro get_irqnr_and_base, irqnr, stat, base, tmp
ldrb \stat, [\base] @ get interrupts
mov \irqnr, #0