diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-13 10:15:35 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-13 10:15:35 +1100 |
| commit | aba0eb84c87928992c021d33ef3ea59c931086b9 (patch) | |
| tree | bdc323efc6773d0dcce4406ca275e9192eabb9b2 /include/linux/of.h | |
| parent | 7230c5644188cd9e3fb380cc97dde00c464a3ba7 (diff) | |
| parent | 3780444c4fcec28c96ab7002858bb051215a5fc1 (diff) | |
Merge branch 'eeh' into next
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index a75a831e2057..3e710d878085 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -58,6 +58,9 @@ struct device_node { struct kref kref; unsigned long _flags; void *data; +#if defined(CONFIG_EEH) + struct eeh_dev *edev; +#endif #if defined(CONFIG_SPARC) char *path_component_name; unsigned int unique_id; @@ -72,6 +75,13 @@ struct of_phandle_args { uint32_t args[MAX_PHANDLE_ARGS]; }; +#if defined(CONFIG_EEH) +static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn) +{ + return dn->edev; +} +#endif + #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) |