[SCSI] ibmvfc: Driver version 1.0.2

[linux-2.6] / include / asm-arm / arch-versatile / entry-macro.S

diff --git a/include/asm-arm/arch-versatile/entry-macro.S b/include/asm-arm/arch-versatile/entry-macro.S
index feff771c0a0a950630cbef18d231da9c5d665d47..924d1a8fe36023b5bed0581e515f14ea64c0696c 100644 (file)
--- a/include/asm-arm/arch-versatile/entry-macro.S
+++ b/include/asm-arm/arch-versatile/entry-macro.S
@@ -13,8 +13,14 @@
                .macro  disable_fiq
                .endm
 
-               .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
+               .macro  get_irqnr_preamble, base, tmp
                ldr     \base, =IO_ADDRESS(VERSATILE_VIC_BASE)
+               .endm
+
+               .macro  arch_ret_to_user, tmp1, tmp2
+               .endm
+
+               .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
                ldr     \irqstat, [\base, #VIC_IRQ_STATUS]      @ get masked status
                mov     \irqnr, #0
                teq     \irqstat, #0