Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / xtensa / lib / memcopy.S

diff --git a/arch/xtensa/lib/memcopy.S b/arch/xtensa/lib/memcopy.S
index e8f6d7eb72222d20e9f095c1d6f36a8db378fe50..ddda8f4bc86266d22daec784bd3ff93bb8857bdf 100644 (file)
--- a/arch/xtensa/lib/memcopy.S
+++ b/arch/xtensa/lib/memcopy.S
@@ -9,7 +9,7 @@
  * Copyright (C) 2002 - 2005 Tensilica Inc.
  */
 
-#include <xtensa/coreasm.h>
+#include <asm/variant/core.h>
 
        .macro  src_b   r, w0, w1
 #ifdef __XTENSA_EB__