Merge ../torvalds-2.6/

[pandora-kernel.git] / arch / mips / lib-64 / memset.S

diff --git a/arch/mips/lib-64/memset.S b/arch/mips/lib-64/memset.S
index 242f197..e2c42c8 100644 (file)
--- a/arch/mips/lib-64/memset.S
+++ b/arch/mips/lib-64/memset.S
@@ -7,7 +7,7 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 #include <asm/asm.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define EX(insn,reg,addr,handler)                      \