diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-16 22:11:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-16 22:11:55 -0500 |
| commit | c30abd5e40dd863f88e26be09b6ce949145a630a (patch) | |
| tree | 5b25362084308502a336d8da26b8dc7430d7c812 /arch/arm/mach-meson/platsmp.c | |
| parent | net: phy: broadcom: Add entry for 5395 switch PHYs (diff) | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (diff) | |
| download | wireguard-linux-c30abd5e40dd863f88e26be09b6ce949145a630a.tar.xz wireguard-linux-c30abd5e40dd863f88e26be09b6ce949145a630a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler
and one in the meson-gxl PHY driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-meson/platsmp.c')
| -rw-r--r-- | arch/arm/mach-meson/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-meson/platsmp.c b/arch/arm/mach-meson/platsmp.c index 2555f9056a33..cad7ee8f0d6b 100644 --- a/arch/arm/mach-meson/platsmp.c +++ b/arch/arm/mach-meson/platsmp.c @@ -102,7 +102,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, scu_base = of_iomap(node, 0); if (!scu_base) { - pr_err("Couln't map SCU registers\n"); + pr_err("Couldn't map SCU registers\n"); return; } |