Merge branch 'x86/cleanups' into x86/urgent

[cascardo/linux.git] / arch / x86 / lib / memset_64.S

diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
index f9962ad..e1229ec 100644 (file)
--- a/arch/x86/lib/memset_64.S
+++ b/arch/x86/lib/memset_64.S
@@ -1,7 +1,7 @@
 /* Copyright 2002 Andi Kleen, SuSE Labs */
 
 #include <linux/linkage.h>
-#include <asm/cpufeature.h>
+#include <asm/cpufeatures.h>
 #include <asm/alternative-asm.h>
 
 .weak memset