From: Johannes Berg <johannes.berg@intel.com>
Date: Sun, 5 Apr 2020 19:33:57 +0000 (+0200)
Subject: um: Fix xor.h include
X-Git-Tag: v5.7-rc7~27^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0e20fd4c1db7cb28874402f78f39870d84398e9;p=thirdparty%2Flinux.git

um: Fix xor.h include

Two independent changes here ended up going into the tree
one after another, without a necessary rename, fix that.

Reported-by: Thomas Meyer <thomas@m3y3r.de>
Fixes: f185063bff91 ("um: Move timer-internal.h to non-shared")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h
index 7a3208c47cfcb..36b33d62a35d8 100644
--- a/arch/um/include/asm/xor.h
+++ b/arch/um/include/asm/xor.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/xor.h>
-#include <shared/timer-internal.h>
+#include <linux/time-internal.h>
 
 /* pick an arbitrary one - measuring isn't possible with inf-cpu */
 #define XOR_SELECT_TEMPLATE(x)	\