summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-02-22 11:13:14 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2011-02-22 11:13:14 +1100
commitcb94ed582857d3ed184fed135bbf9e7e5d9cf0dc (patch)
treec55456c4b5e34b1bc9701d8dfb614032c3461d7b /fs
parent3678f9f43bad041c05732d6fbd4a120106d7fad7 (diff)
parent10e36d26ce1af5387d12e3fcb576921178175d95 (diff)
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/proc_devtree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index d9396a4fc7ff..927cbd115e53 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -233,7 +233,7 @@ void __init proc_device_tree_init(void)
return;
root = of_find_node_by_path("/");
if (root == NULL) {
- printk(KERN_ERR "/proc/device-tree: can't find root\n");
+ pr_debug("/proc/device-tree: can't find root\n");
return;
}
proc_device_tree_add_node(root, proc_device_tree);