of/dynamic: Fix test for PPC_PSERIES
"IS_ENABLED(PPC_PSERIES)" always evaluates to false, as IS_ENABLED() is
supposed to be used with the full Kconfig symbol name, including the
"CONFIG_" prefix.
Add the missing "CONFIG_" prefix to fix this.
Fixes: a25095d451
("of: Move dynamic node fixups out of powerpc and into common code")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: stable@vger.kernel.org #+3.17
Signed-off-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
parent
c65b99f046
commit
f76502aa91
@ -225,7 +225,7 @@ void __of_attach_node(struct device_node *np)
|
|||||||
phandle = __of_get_property(np, "phandle", &sz);
|
phandle = __of_get_property(np, "phandle", &sz);
|
||||||
if (!phandle)
|
if (!phandle)
|
||||||
phandle = __of_get_property(np, "linux,phandle", &sz);
|
phandle = __of_get_property(np, "linux,phandle", &sz);
|
||||||
if (IS_ENABLED(PPC_PSERIES) && !phandle)
|
if (IS_ENABLED(CONFIG_PPC_PSERIES) && !phandle)
|
||||||
phandle = __of_get_property(np, "ibm,phandle", &sz);
|
phandle = __of_get_property(np, "ibm,phandle", &sz);
|
||||||
np->phandle = (phandle && (sz >= 4)) ? be32_to_cpup(phandle) : 0;
|
np->phandle = (phandle && (sz >= 4)) ? be32_to_cpup(phandle) : 0;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user