linux-next: manual merge of the gpio tree with the devicetree tree

[Stephen Rothwell]

Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
include/linux/of.h between commit 3ecdd0515287 ("dt: add empty
of_get_node/of_put_node functions") from the devicetree tree and commit
15c9a0acc3f7 ("of: create of_phandle_args to simplify return of phandle
parsing data") from the gpio tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/of.h
index 9abd3ec,ea44fd7..0000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -65,20 -65,13 +65,27 @@@ struct device_node 
  #endif
  };
  
+ #define MAX_PHANDLE_ARGS 8
+ struct of_phandle_args {
+ 	struct device_node *np;
+ 	int args_count;
+ 	uint32_t args[MAX_PHANDLE_ARGS];
+ };
+ 
 +#if defined(CONFIG_SPARC) || !defined(CONFIG_OF)
 +/* Dummy ref counting routines - to be implemented later */
 +static inline struct device_node *of_node_get(struct device_node *node)
 +{
 +	return node;
 +}
 +static inline void of_node_put(struct device_node *node)
 +{
 +}
 +#else
 +extern struct device_node *of_node_get(struct device_node *node);
 +extern void of_node_put(struct device_node *node);
 +#endif
 +
  #ifdef CONFIG_OF
  
  /* Pointer for first entry in chain of all nodes. */

Attachment: pgp00000.pgp
Description: PGP signature