diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-03-31 10:44:53 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-03-31 10:44:53 -0400 |
| commit | cf39d37539068d53e015d8b4f1dcf42c65306b0d (patch) | |
| tree | c8dcbbc3a5c92beee82e83e2a2b597f328a919a6 /arch/csky/kernel/time.c | |
| parent | 830948eb68265ac7f3f364aa9801550feafec0d6 (diff) | |
| parent | 463050599742a89e0508355e626e032e8d0dab8d (diff) | |
| download | linux-cf39d37539068d53e015d8b4f1dcf42c65306b0d.tar.gz linux-cf39d37539068d53e015d8b4f1dcf42c65306b0d.tar.bz2 linux-cf39d37539068d53e015d8b4f1dcf42c65306b0d.zip | |
Merge tag 'kvmarm-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm updates for Linux 5.7
- GICv4.1 support
- 32bit host removal
Diffstat (limited to 'arch/csky/kernel/time.c')
| -rw-r--r-- | arch/csky/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/csky/kernel/time.c b/arch/csky/kernel/time.c index b5fc9447d93f..52379d866fe4 100644 --- a/arch/csky/kernel/time.c +++ b/arch/csky/kernel/time.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. -#include <linux/clk-provider.h> #include <linux/clocksource.h> +#include <linux/of_clk.h> void __init time_init(void) { |