Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / include / asm-mips / sgiarcs.h

diff --git a/include/asm-mips/sgiarcs.h b/include/asm-mips/sgiarcs.h
index 722b77a8c5e5a010fe693374ac37644c7a6cd43f..439bce7daa3a407bf9b5659acf7ac64748300034 100644 (file)
--- a/include/asm-mips/sgiarcs.h
+++ b/include/asm-mips/sgiarcs.h
@@ -12,7 +12,6 @@
 #ifndef _ASM_SGIARCS_H
 #define _ASM_SGIARCS_H
 
-#include <linux/config.h>
 #include <asm/types.h>
 #include <asm/arc/types.h>
 
@@ -460,7 +459,7 @@ struct linux_smonblock {
        register signed int __a2 __asm__("$5") = (int) (long) (a2);     \
        register signed int __a3 __asm__("$6") = (int) (long) (a3);     \
        register signed int __a4 __asm__("$7") = (int) (long) (a4);     \
-       register signed int __a5 = (a5);                                \
+       register signed int __a5 = (int) (long) (a5);                   \
        long __vec = (long) romvec->dest;                               \
        __asm__ __volatile__(                                           \
        "dsubu\t$29, 32\n\t"                                            \