linux-next: manual merge of the omap_dss2 tree with the pm tree

From: Stephen Rothwell
Date: Sun Nov 16 2014 - 23:16:59 EST

Hi Tomi,

Today's linux-next merge of the omap_dss2 tree got a conflict in
include/linux/of.h between commit 8a0662d9ed29 ("Driver core: Unified
interface for firmware node properties") from the pm tree and commit
6d09dc6b74ca ("of.h: Keep extern declaration of of_* variables
when !CONFIG_OF") from the omap_dss2 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/of.h
index 189fc53bc7df,f83ca9dddcba..000000000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -117,16 -112,7 +115,17 @@@ extern struct device_node *of_aliases
extern struct device_node *of_stdout;
extern raw_spinlock_t devtree_lock;

+ #ifdef CONFIG_OF
+static inline bool is_of_node(struct fwnode_handle *fwnode)
+ return fwnode && fwnode->type == FWNODE_OF;
+static inline struct device_node *of_node(struct fwnode_handle *fwnode)
+ return fwnode ? container_of(fwnode, struct device_node, fwnode) : NULL;
static inline bool of_have_populated_dt(void)
return of_allnodes != NULL;

Attachment: pgpqcmpgjEx_C.pgp
Description: OpenPGP digital signature