Skip to content

Commit 063731c

Browse files
committed
Merge tag 'v5.8-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/soc
A spelling fix and stop using clk_provider.h when of_clk.h is enough as the soc file is only a clock user, not a provider. * tag 'v5.8-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: fix spelling mistake "to" -> "too" ARM: rockchip: Replace <linux/clk-provider.h> by <linux/of_clk.h> Link: https://lore.kernel.org/r/2307012.mB7vfBFN1M@phil Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ac78649 + 0b973c6 commit 063731c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/mach-rockchip/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node)
180180

181181
rsize = resource_size(&res);
182182
if (rsize < trampoline_sz) {
183-
pr_err("%s: reserved block with size 0x%x is to small for trampoline size 0x%x\n",
183+
pr_err("%s: reserved block with size 0x%x is too small for trampoline size 0x%x\n",
184184
__func__, rsize, trampoline_sz);
185185
return -EINVAL;
186186
}

arch/arm/mach-rockchip/rockchip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#include <linux/kernel.h>
1010
#include <linux/init.h>
1111
#include <linux/io.h>
12+
#include <linux/of_clk.h>
1213
#include <linux/of_platform.h>
1314
#include <linux/irqchip.h>
14-
#include <linux/clk-provider.h>
1515
#include <linux/clocksource.h>
1616
#include <linux/mfd/syscon.h>
1717
#include <linux/regmap.h>

0 commit comments

Comments
 (0)