diff options
author | Olof Johansson <olof@lixom.net> | 2017-09-06 05:29:46 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-09-06 05:29:46 +0200 |
commit | 9ec83463d679a51560135ac8cf023567fbb6e4c0 (patch) | |
tree | c79dd6cfc3bc99af5590298eebf55ab7ee354b01 /arch/arm/mach-mvebu | |
parent | MAINTAINERS: Update Cavium ThunderX2 entry (diff) | |
parent | Merge tag 'omap-for-v4.14/fixes-not-urgent-v2-signed' of git://git.kernel.org... (diff) | |
download | linux-9ec83463d679a51560135ac8cf023567fbb6e4c0.tar.xz linux-9ec83463d679a51560135ac8cf023567fbb6e4c0.zip |
Merge branch 'next/cleanup' into next/soc
* next/cleanup:
soc: versatile: remove unnecessary static in realview_soc_probe()
ARM: Convert to using %pOF instead of full_name
ARM: hisi: Fix typo in comment
ARM: OMAP4+: PRM: fix of_irq_get() result checks
ARM: OMAP3+: PRM: fix of_irq_get() result check
ARM: dts: dra72-evm-revc: workaround incorrect DP83867 RX_CTRL pin strap
ARM: dts: dra71-evm: workaround incorrect DP83867 RX_CTRL pin strap
ARM: OMAP2+: omap_device: drop broken RPM status update from suspend_noirq
bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r-- | arch/arm/mach-mvebu/kirkwood.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 7d9f2fd9e450..0aa88105d46e 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -107,8 +107,7 @@ static void __init kirkwood_dt_eth_fixup(void) clk_prepare_enable(clk); /* store MAC address register contents in local-mac-address */ - pr_err(FW_INFO "%s: local-mac-address is not set\n", - np->full_name); + pr_err(FW_INFO "%pOF: local-mac-address is not set\n", np); pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL); if (!pmac) |