summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ks8695/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-02-22 23:04:41 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-22 23:04:41 +0100
commit61b80086a525c8a6081257ae40da5dee2bcaee16 (patch)
tree675da35e4c03be3a5ca17bf6430e5b51dfed6296 /arch/arm/mach-ks8695/include
parentMerge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff)
parentARM: remove disable_fiq and arch_ret_to_user macros (diff)
downloadlinux-61b80086a525c8a6081257ae40da5dee2bcaee16.tar.xz
linux-61b80086a525c8a6081257ae40da5dee2bcaee16.zip
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
Diffstat (limited to 'arch/arm/mach-ks8695/include')
-rw-r--r--arch/arm/mach-ks8695/include/mach/entry-macro.S6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/entry-macro.S b/arch/arm/mach-ks8695/include/mach/entry-macro.S
index b4fe0c11c6ce..8315b34f32ff 100644
--- a/arch/arm/mach-ks8695/include/mach/entry-macro.S
+++ b/arch/arm/mach-ks8695/include/mach/entry-macro.S
@@ -14,16 +14,10 @@
#include <mach/hardware.h>
#include <mach/regs-irq.h>
- .macro disable_fiq
- .endm
-
.macro get_irqnr_preamble, base, tmp
ldr \base, =KS8695_IRQ_VA @ Base address of interrupt controller
.endm
- .macro arch_ret_to_user, tmp1, tmp2
- .endm
-
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
ldr \irqstat, [\base, #KS8695_INTMS] @ Mask Status register