summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2020-04-05 21:33:57 +0200
committerRichard Weinberger <richard@nod.at>2020-04-29 21:21:51 +0200
commitd0e20fd4c1db7cb28874402f78f39870d84398e9 (patch)
tree3b577fd84723066cccae675e0c9e5da1a7cd142a /arch/um
parent1d2cc5ac6f6668cc15216d51051103c61467d7e8 (diff)
downloadlinux-d0e20fd4c1db7cb28874402f78f39870d84398e9.tar.bz2
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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/asm/xor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h
index 7a3208c47cfc..36b33d62a35d 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) \