diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 17:04:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 17:04:41 -0500 |
| commit | 61b80086a525c8a6081257ae40da5dee2bcaee16 (patch) | |
| tree | 675da35e4c03be3a5ca17bf6430e5b51dfed6296 /arch/arm/mach-pnx4008 | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 230f984662d7e0e4a9597c665fd4f53130666e7d (diff) | |
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
Diffstat (limited to 'arch/arm/mach-pnx4008')
| -rw-r--r-- | arch/arm/mach-pnx4008/include/mach/entry-macro.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-pnx4008/include/mach/entry-macro.S b/arch/arm/mach-pnx4008/include/mach/entry-macro.S index db7eeebf30d..77a55584671 100644 --- a/arch/arm/mach-pnx4008/include/mach/entry-macro.S +++ b/arch/arm/mach-pnx4008/include/mach/entry-macro.S | |||
| @@ -25,15 +25,9 @@ | |||
| 25 | #define SIC1_BASE_INT 32 | 25 | #define SIC1_BASE_INT 32 |
| 26 | #define SIC2_BASE_INT 64 | 26 | #define SIC2_BASE_INT 64 |
| 27 | 27 | ||
| 28 | .macro disable_fiq | ||
| 29 | .endm | ||
| 30 | |||
| 31 | .macro get_irqnr_preamble, base, tmp | 28 | .macro get_irqnr_preamble, base, tmp |
| 32 | .endm | 29 | .endm |
| 33 | 30 | ||
| 34 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 35 | .endm | ||
| 36 | |||
| 37 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 31 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
| 38 | /* decode the MIC interrupt numbers */ | 32 | /* decode the MIC interrupt numbers */ |
| 39 | ldr \base, =IO_ADDRESS(PNX4008_INTCTRLMIC_BASE) | 33 | ldr \base, =IO_ADDRESS(PNX4008_INTCTRLMIC_BASE) |