diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 14:03:08 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 14:03:08 +0100 |
| commit | b775e642bf958a02210ac4d4edd1a1b7067c49fa (patch) | |
| tree | a3425ead7b2738e6a05249a3c3667d1069782330 /include/linux | |
| parent | 32147e9a8ea54f2ec9914edeede8a9d9dc02e886 (diff) | |
| parent | ccdb8ed3b3c739fe99a6f2f474f7ffad3203485d (diff) | |
Merge branch 'devicetree/next-console' into devicetree/next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 196b34c1ef4e..f0d256273c83 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -113,6 +113,7 @@ static inline void of_node_put(struct device_node *node) { } extern struct device_node *of_allnodes; extern struct device_node *of_chosen; extern struct device_node *of_aliases; +extern struct device_node *of_stdout; extern raw_spinlock_t devtree_lock; static inline bool of_have_populated_dt(void) @@ -352,7 +353,7 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur, */ const char *of_prop_next_string(struct property *prop, const char *cur); -int of_device_is_stdout_path(struct device_node *dn); +bool of_console_check(struct device_node *dn, char *name, int index); #else /* CONFIG_OF */ @@ -564,9 +565,9 @@ static inline int of_machine_is_compatible(const char *compat) return 0; } -static inline int of_device_is_stdout_path(struct device_node *dn) +static inline bool of_console_check(const struct device_node *dn, const char *name, int index) { - return 0; + return false; } static inline const __be32 *of_prop_next_u32(struct property *prop, |