Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be19c4ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4b170692 f76502aa

drivers/of/dynamic.c

+1 −1
Original line number Diff line number Diff line
@@ -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;