Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts

[firefly-linux-kernel-4.4.55.git] / lib / halfmd4.c

diff --git a/lib/halfmd4.c b/lib/halfmd4.c
index 66d0ee8b777652d83cc9464c36ac0215bf931a90..a8fe6274a13cfe4265f8f60a7726ba8f1def6edb 100644 (file)
--- a/lib/halfmd4.c
+++ b/lib/halfmd4.c
@@ -1,4 +1,4 @@
-#include <linux/kernel.h>
+#include <linux/compiler.h>
 #include <linux/export.h>
 #include <linux/cryptohash.h>