diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-06-04 11:34:41 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-06-05 03:39:28 +0200 |
| commit | f76502aa9140ec338a59487218bf70a9c9e92b8f (patch) | |
| tree | e9466bdc1d35d86bf0ed1fcdd3b1a1fedffd7e68 /drivers/of | |
| parent | Linux 4.1-rc6 (diff) | |
| download | linux-f76502aa9140ec338a59487218bf70a9c9e92b8f.tar.xz linux-f76502aa9140ec338a59487218bf70a9c9e92b8f.zip | |
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: a25095d451ece23b ("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>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/dynamic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 3351ef408125..53826b84e0ec 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -225,7 +225,7 @@ void __of_attach_node(struct device_node *np) phandle = __of_get_property(np, "phandle", &sz); if (!phandle) 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); np->phandle = (phandle && (sz >= 4)) ? be32_to_cpup(phandle) : 0; |