Pull thermal into release branch

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

diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S
index 4641ef510f0e0a269dbc082e68102c70c7c0162b..a8ab1d4fe0ae1530026d1cfe6542071c7387cf81 100644 (file)
--- a/arch/xtensa/lib/usercopy.S
+++ b/arch/xtensa/lib/usercopy.S
@@ -53,7 +53,7 @@
  *     a11/ original length
  */
 
-#include <xtensa/coreasm.h>
+#include <asm/variant/core.h>
 
 #ifdef __XTENSA_EB__
 #define ALIGN(R, W0, W1) src   R, W0, W1