diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 20:24:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 20:24:30 -0700 |
| commit | 510597e26e2a072e2d46ea5bc57feaf385e37f70 (patch) | |
| tree | 5ffe90e6569481506b06fb6d6a409655fac4f7f6 /arch/arm/mach-nuc93x/include/mach/entry-macro.S | |
| parent | cd9a0b6bd67ec372b0ef3cb2abe26974f888b956 (diff) | |
| parent | 4702abd3f9728893ad5b0f4389e1902588510459 (diff) | |
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
* 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc:
ARM: mach-nuc93x: delete
Fix up trivial delete/edit conflicts in
arch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}
Diffstat (limited to 'arch/arm/mach-nuc93x/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-nuc93x/include/mach/entry-macro.S | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm/mach-nuc93x/include/mach/entry-macro.S b/arch/arm/mach-nuc93x/include/mach/entry-macro.S deleted file mode 100644 index 1352cbda379..00000000000 --- a/arch/arm/mach-nuc93x/include/mach/entry-macro.S +++ /dev/null @@ -1,32 +0,0 @@ -/* - * arch/arm/mach-nuc93x/include/mach/entry-macro.S - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - * - */ - -#include <mach/hardware.h> -#include <mach/regs-irq.h> - - .macro get_irqnr_preamble, base, tmp - .endm - - .macro arch_ret_to_user, tmp1, tmp2 - .endm - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - - mov \base, #AIC_BA - - ldr \irqnr, [ \base, #AIC_IPER] - ldr \irqnr, [ \base, #AIC_ISNR] - cmp \irqnr, #0 - - .endm - - /* currently don't need an disable_fiq macro */ - - .macro disable_fiq - .endm |