Merge tag 'bcm2835-clk-next-2016-03-17' of git://github.com/anholt/linux into clk...
[cascardo/linux.git] / arch / x86 / include / asm / uaccess_64.h
index b89c34c..3076986 100644 (file)
@@ -8,7 +8,7 @@
 #include <linux/errno.h>
 #include <linux/lockdep.h>
 #include <asm/alternative.h>
-#include <asm/cpufeature.h>
+#include <asm/cpufeatures.h>
 #include <asm/page.h>
 
 /*