diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 16:08:32 +0200 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 16:08:32 +0200 |
commit | 3f04e3d3eb77ac9df70619b9c87da71b0eeddc36 (patch) | |
tree | cf1cbadc390888d1910a81ffc40161f783363075 /arch/arm/mach-rockchip/platsmp.c | |
parent | 8cffcb0ca33381e07cee4ebe1301d0794054fc97 (diff) | |
parent | 2779ac167b1a1bf8153dca9f3a141c6148c6b89f (diff) | |
download | linux-3f04e3d3eb77ac9df70619b9c87da71b0eeddc36.tar.gz linux-3f04e3d3eb77ac9df70619b9c87da71b0eeddc36.tar.bz2 linux-3f04e3d3eb77ac9df70619b9c87da71b0eeddc36.zip |
Merge remote-tracking branch 'tip/timers/core/timers/core' into clockevents/3.16
Diffstat (limited to 'arch/arm/mach-rockchip/platsmp.c')
-rw-r--r-- | arch/arm/mach-rockchip/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index dbfa5a26cfff..072842f6491b 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -152,7 +152,7 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) node = of_find_compatible_node(NULL, NULL, "rockchip,rk3066-pmu"); if (!node) { - pr_err("%s: could not find sram dt node\n", __func__); + pr_err("%s: could not find pmu dt node\n", __func__); return; } |