diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-03-02 06:59:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-02 07:04:16 -0500 |
| commit | 6139dbbb7769c7251e04813f577454c6c9293e15 (patch) | |
| tree | 588b44b4b8929caf812d440ec371331658fd7da3 /include/asm-arm/arch-omap/entry-macro.S | |
| parent | 9623b3732d11b0a18d9af3419f680d27ea24b014 (diff) | |
| parent | 1f4d1774133f596a3c4f520859890ad93769e523 (diff) | |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'include/asm-arm/arch-omap/entry-macro.S')
| -rw-r--r-- | include/asm-arm/arch-omap/entry-macro.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S index c90dff4828f7..f6967c8df323 100644 --- a/include/asm-arm/arch-omap/entry-macro.S +++ b/include/asm-arm/arch-omap/entry-macro.S | |||
| @@ -61,6 +61,12 @@ | |||
| 61 | .macro disable_fiq | 61 | .macro disable_fiq |
| 62 | .endm | 62 | .endm |
| 63 | 63 | ||
| 64 | .macro get_irqnr_preamble, base, tmp | ||
| 65 | .endm | ||
| 66 | |||
| 67 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 68 | .endm | ||
| 69 | |||
| 64 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 70 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
| 65 | ldr \base, =VA_IC_BASE | 71 | ldr \base, =VA_IC_BASE |
| 66 | ldr \irqnr, [\base, #0x98] /* IRQ pending reg 1 */ | 72 | ldr \irqnr, [\base, #0x98] /* IRQ pending reg 1 */ |