diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-06 13:32:47 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-06 13:32:47 -0800 |
| commit | 00fd72ccc928c1fefc4c9c3b925f82cb71750dfb (patch) | |
| tree | fb77d8bad2e21597ed5d0b34fdd040044999e2c2 /arch/arm/mach-footbridge/include/mach/entry-macro.S | |
| parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) | |
| parent | 1416408d31236dc2a80d269aa23ffa93aa01e833 (diff) | |
| download | talos-op-linux-00fd72ccc928c1fefc4c9c3b925f82cb71750dfb.tar.gz talos-op-linux-00fd72ccc928c1fefc4c9c3b925f82cb71750dfb.zip | |
Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into cleanup-pm
Diffstat (limited to 'arch/arm/mach-footbridge/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-footbridge/include/mach/entry-macro.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/entry-macro.S b/arch/arm/mach-footbridge/include/mach/entry-macro.S index d3847be0c667..dabbd5c54a78 100644 --- a/arch/arm/mach-footbridge/include/mach/entry-macro.S +++ b/arch/arm/mach-footbridge/include/mach/entry-macro.S @@ -14,9 +14,6 @@ .equ dc21285_high, ARMCSR_BASE & 0xff000000 .equ dc21285_low, ARMCSR_BASE & 0x00ffffff - .macro disable_fiq - .endm - .macro get_irqnr_preamble, base, tmp mov \base, #dc21285_high .if dc21285_low @@ -24,9 +21,6 @@ .endif .endm - .macro arch_ret_to_user, tmp1, tmp2 - .endm - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp ldr \irqstat, [\base, #0x180] @ get interrupts |
