diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-arm/arch-pnx4008/entry-macro.S | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-arm/arch-pnx4008/entry-macro.S')
| -rw-r--r-- | include/asm-arm/arch-pnx4008/entry-macro.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pnx4008/entry-macro.S b/include/asm-arm/arch-pnx4008/entry-macro.S index c1c198e3680b..f11731974e5d 100644 --- a/include/asm-arm/arch-pnx4008/entry-macro.S +++ b/include/asm-arm/arch-pnx4008/entry-macro.S | |||
| @@ -28,6 +28,12 @@ | |||
| 28 | .macro disable_fiq | 28 | .macro disable_fiq |
| 29 | .endm | 29 | .endm |
| 30 | 30 | ||
| 31 | .macro get_irqnr_preamble, base, tmp | ||
| 32 | .endm | ||
| 33 | |||
| 34 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 35 | .endm | ||
| 36 | |||
| 31 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 37 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
| 32 | /* decode the MIC interrupt numbers */ | 38 | /* decode the MIC interrupt numbers */ |
| 33 | ldr \base, =IO_ADDRESS(PNX4008_INTCTRLMIC_BASE) | 39 | ldr \base, =IO_ADDRESS(PNX4008_INTCTRLMIC_BASE) |