path: root/fs/proc/proc_devtree.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-25 15:38:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-25 15:38:37 -0800
commit6ebdc661b608671e9ca572af8bb42d58108cc008 (patch)
treee99caacb964a27caeae699160fa5eddcb14526e9 /fs/proc/proc_devtree.c
parentd7930c9ef9cc67044f5ddaac54d06ca22645a012 (diff)
parentdf0edeb59eb559be0bee53452fda2f5cc0ae133f (diff)
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits) of: remove undefined request_OF_resource & release_OF_resource of/sparc: Remove sparc-local declaration of allnodes and devtree_lock of: move definition of of_chosen into common code. of: remove unused extern reference to devtree_lock of: put default string compare and #a/s-cell values into common header of/flattree: Don't assume HAVE_LMB of: protect linux/of.h with CONFIG_OF proc_devtree: fix THIS_MODULE without module.h of: Remove old and misplaced function declarations of/flattree: Make the kernel accept ePAPR style phandle information of/flattree: endian-convert members of boot_param_header of: assume big-endian properties, adding conversions where necessary of: use __be32 for cell value accessors of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing of/flattree: use callback to setup initrd from /chosen proc_devtree: include linux/of.h of: make set_node_proc_entry private to proc_devtree.c of: include linux/proc_fs.h of/flattree: merge early_init_dt_scan_memory() common code of: add 'of_' prefix to machine_is_compatible() ...
Diffstat (limited to 'fs/proc/proc_devtree.c')
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 123257bb356..f8650dce74f 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -10,16 +10,19 @@
#include <linux/seq_file.h>
#include <linux/stat.h>
#include <linux/string.h>
+#include <linux/of.h>
+#include <linux/module.h>
#include <asm/prom.h>
#include <asm/uaccess.h>
#include "internal.h"
static inline void set_node_proc_entry(struct device_node *np,
struct proc_dir_entry *de)
+ np->pde = de;
static struct proc_dir_entry *proc_device_tree;