Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / arch / v850 / kernel / entry.S

diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S
index 895e27b1d839f795491fa84a6464e5e929b1f373..8bc521ca081f9a32fec0d51d12e8ef4f1044f8c3 100644 (file)
--- a/arch/v850/kernel/entry.S
+++ b/arch/v850/kernel/entry.S
@@ -22,7 +22,7 @@
 #include <asm/irq.h>
 #include <asm/errno.h>
 
-#include <asm/asm-consts.h>
+#include <asm/asm-offsets.h>
 
 
 /* Make a slightly more convenient alias for C_SYMBOL_NAME.  */
@@ -195,7 +195,7 @@
        sst.w   lp, PTO+PT_GPR(GPR_LP)[ep];                                   \
        type ## _STATE_SAVER
 /* Pop a register state pushed by PUSH_STATE, except for the stack pointer,
-   from the the stack.  */
+   from the stack.  */
 #define POP_STATE(type)                                                              \
        mov     sp, ep;                                                       \
        type ## _STATE_RESTORER;                                              \