Merge branches 'release', 'idle', 'redhat-bugzilla-436589', 'sbs' and 'video' into...

[sfrench/cifs-2.6.git] / arch / sh / kernel / cpu / sh2 / entry.S

diff --git a/arch/sh/kernel/cpu/sh2/entry.S b/arch/sh/kernel/cpu/sh2/entry.S
index 7a26569e79563b5521ba223ef6b896e3a8b32ca5..0fc89069d8c7cd65566d19d1c06da515000dc014 100644 (file)
--- a/arch/sh/kernel/cpu/sh2/entry.S
+++ b/arch/sh/kernel/cpu/sh2/entry.S
@@ -267,7 +267,6 @@ ENTRY(sh_bios_handler)
 
 ENTRY(address_error_trap_handler)
        mov     r15,r4                          ! regs
-       add     #4,r4
        mov     #OFF_PC,r0
        mov.l   @(r0,r15),r6                    ! pc
        mov.l   1f,r0