diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-25 08:55:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-25 08:55:12 +0200 |
| commit | f7d8f3f092d001f8d91552d2697643e727694942 (patch) | |
| tree | 0dfa61cc5b94eef94dfbaf1efdc362385792d0f2 /arch/um/include/asm/xor.h | |
| parent | 2cd38fd15e4ebcfe917a443734820269f8b5ba2b (diff) | |
| parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
| download | linux-f7d8f3f092d001f8d91552d2697643e727694942.tar.gz linux-f7d8f3f092d001f8d91552d2697643e727694942.tar.bz2 linux-f7d8f3f092d001f8d91552d2697643e727694942.zip | |
Merge 5.7-rc7 into driver-core-next
We need the driver core fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/um/include/asm/xor.h')
| -rw-r--r-- | arch/um/include/asm/xor.h | 2 |
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) \ |