Merge branch 'merge'

[mv-sheeva.git] / arch / arm / nwfpe / entry26.S

diff --git a/arch/arm/nwfpe/entry26.S b/arch/arm/nwfpe/entry26.S
index 0ed38b0913dbb236002e1bfa8bfdb73fd049b832..3e6fb5d21d6452dc6e6751e544ee20d3a6d4bcd8 100644 (file)
--- a/arch/arm/nwfpe/entry26.S
+++ b/arch/arm/nwfpe/entry26.S
@@ -20,13 +20,13 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
 /* This is the kernel's entry point into the floating point emulator.
 It is called from the kernel with code similar to this:
 
        mov     fp, #0
-       teqp    pc, #PSR_I_BIT | MODE_SVC
+       teqp    pc, #PSR_I_BIT | SVC_MODE
        ldr     r4, .LC2
        ldr     pc, [r4]                @ Call FP module USR entry point