diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-06 21:43:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-06 21:43:29 -0700 |
| commit | be19c4ab813a0fec6cd8204a998e8904ad0f8ed3 (patch) | |
| tree | 0548c796e84c18843c9ee20368c4e7a240c8e9c1 | |
| parent | 4b1706927d8ebc9e0be6802b6d6918ad9f3d6843 (diff) | |
| parent | f76502aa9140ec338a59487218bf70a9c9e92b8f (diff) | |
| download | op-kernel-dev-be19c4ab813a0fec6cd8204a998e8904ad0f8ed3.zip op-kernel-dev-be19c4ab813a0fec6cd8204a998e8904ad0f8ed3.tar.gz | |
Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux
Pull devicetree fix from Grant Likely:
"Stupid typo fix for v4.1. One of the IS_ENABLED() macro calls forgot
the CONFIG_ prefix. Only affects a tiny number of platforms, but
still..."
* tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
of/dynamic: Fix test for PPC_PSERIES
| -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 3351ef4..53826b8 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; |
