Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / include / asm-mips / checksum.h

diff --git a/include/asm-mips/checksum.h b/include/asm-mips/checksum.h
index 2ff53db8c0239e5ba76d6c1b89e9c9df9bf5e329..a5e6050ec0f3942c6ef25886b41d14d41c0dc286 100644 (file)
--- a/include/asm-mips/checksum.h
+++ b/include/asm-mips/checksum.h
@@ -11,7 +11,6 @@
 #ifndef _ASM_CHECKSUM_H
 #define _ASM_CHECKSUM_H
 
-#include <linux/config.h>
 #include <linux/in6.h>
 
 #include <asm/uaccess.h>
@@ -150,7 +149,7 @@ static inline unsigned int csum_tcpudp_nofold(unsigned long saddr,
        "       daddu   %0, %4          \n"
        "       dsll32  $1, %0, 0       \n"
        "       daddu   %0, $1          \n"
-       "       dsrl32  %0, %0, 0       \n"
+       "       dsra32  %0, %0, 0       \n"
 #endif
        "       .set    pop"
        : "=r" (sum)