Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[firefly-linux-kernel-4.4.55.git] / kernel / time.c

diff --git a/kernel/time.c b/kernel/time.c
index 6d98ab72f38b075c707d5a78cc7d231cc919aa02..f04791f694081d16dab799ae16f5b3f405683e4d 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -31,7 +31,6 @@
 #include <linux/timex.h>
 #include <linux/capability.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/security.h>
 #include <linux/fs.h>