diff options
| -rw-r--r-- | fs/proc/proc_devtree.c | 5 | ||||
| -rw-r--r-- | include/linux/of.h | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index 123257bb356..2309bf17203 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c | |||
| @@ -14,12 +14,13 @@ | |||
| 14 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
| 15 | #include "internal.h" | 15 | #include "internal.h" |
| 16 | 16 | ||
| 17 | #ifndef HAVE_ARCH_DEVTREE_FIXUPS | ||
| 18 | static inline void set_node_proc_entry(struct device_node *np, | 17 | static inline void set_node_proc_entry(struct device_node *np, |
| 19 | struct proc_dir_entry *de) | 18 | struct proc_dir_entry *de) |
| 20 | { | 19 | { |
| 21 | } | 20 | #ifdef HAVE_ARCH_DEVTREE_FIXUPS |
| 21 | np->pde = de; | ||
| 22 | #endif | 22 | #endif |
| 23 | } | ||
| 23 | 24 | ||
| 24 | static struct proc_dir_entry *proc_device_tree; | 25 | static struct proc_dir_entry *proc_device_tree; |
| 25 | 26 | ||
diff --git a/include/linux/of.h b/include/linux/of.h index 3cc0d7ae290..fd47c81d7a2 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
| @@ -73,12 +73,6 @@ static inline void of_node_set_flag(struct device_node *n, unsigned long flag) | |||
| 73 | set_bit(flag, &n->_flags); | 73 | set_bit(flag, &n->_flags); |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | static inline void | ||
| 77 | set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de) | ||
| 78 | { | ||
| 79 | dn->pde = de; | ||
| 80 | } | ||
| 81 | |||
| 82 | extern struct device_node *of_find_all_nodes(struct device_node *prev); | 76 | extern struct device_node *of_find_all_nodes(struct device_node *prev); |
| 83 | 77 | ||
| 84 | #if defined(CONFIG_SPARC) | 78 | #if defined(CONFIG_SPARC) |
