diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 10:19:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 10:19:40 -0700 |
| commit | 987aec39a74373c55c3bedd5c3c83896d78fd0a2 (patch) | |
| tree | 66aba6d4f166f269be95fe4d267d57efe533aefd /drivers/of/dynamic.c | |
| parent | 303cda0ea7c1c33701812ccb80d37083a4093c7c (diff) | |
| parent | d4a4f75cd8f29cd9464a5a32e9224a91571d6649 (diff) | |
| download | kernel_replicant_linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.tar.gz kernel_replicant_linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.tar.bz2 kernel_replicant_linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.zip | |
Merge 4.1-rc7 into driver-core-next
We want the fixes in this branch as well for testing and merge
resolution.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of/dynamic.c')
| -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; |