diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 20:55:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 20:55:54 +0100 |
| commit | ce5b71d3ff07652e9a95cb7cb03daafd01f30410 (patch) | |
| tree | 1a53d82331a24fa7f69835399c8e1930bb832536 | |
| parent | 7cd6fa606241b765b49f74b996e55dfaa44a0a29 (diff) | |
| parent | 614215c8636aeb61961b3eb5030999a2254b3b52 (diff) | |
Merge tag 'sunxi-core-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/soc
Allwinner Core Changes for v5.7
Just one change for our mach code for including the correct clk header.
* tag 'sunxi-core-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: sunxi: Replace <linux/clk-provider.h> by <linux/of_clk.h>
Link: https://lore.kernel.org/r/20200313055342.GA19760@wens.csie.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 933b6930f024..06da2747a90b 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -10,9 +10,9 @@ * warranty of any kind, whether express or implied. */ -#include <linux/clk-provider.h> #include <linux/clocksource.h> #include <linux/init.h> +#include <linux/of_clk.h> #include <linux/platform_device.h> #include <linux/reset/sunxi.h> |