diff --git a/[refs] b/[refs]
index bc5e0983ba49..92d479787aa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54213baf643dd14d3bc06ca7575a817d79a350c2
+refs/heads/master: 176fd6c96dcbc263eb1c61eae9fe2a33f23a876d
diff --git a/trunk/include/asm-xtensa/div64.h b/trunk/include/asm-xtensa/div64.h
index 20965e3af1dd..f35678cb0a9b 100644
--- a/trunk/include/asm-xtensa/div64.h
+++ b/trunk/include/asm-xtensa/div64.h
@@ -5,21 +5,12 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2007 Tensilica Inc.
  */
 
 #ifndef _XTENSA_DIV64_H
 #define _XTENSA_DIV64_H
 
-#include <linux/types.h>
+#include <asm-generic/div64.h>
 
-#define do_div(n,base) ({ \
-	int __res = n % ((unsigned int) base); \
-	n /= (unsigned int) base; \
-	__res; })
-
-static inline uint64_t div64_64(uint64_t dividend, uint64_t divisor)
-{
-	return dividend / divisor;
-}
-#endif
+#endif /* _XTENSA_DIV64_H */