Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech...

[mirror_ubuntu-artful-kernel.git] / kernel / time / jiffies.c

diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index c4bb518725b5f904fe01804095788026de3a31f1..347fecf86a3fb2242e0a88b63975424f0293dde7 100644 (file)
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 
-#include "tick-internal.h"
+#include "timekeeping.h"
 
 /* The Jiffies based clocksource is the lowest common
  * denominator clock source which should function on