diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-02 20:01:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-02 20:01:57 -0800 |
| commit | f7d222ea2ac7aebf1ac06a76e7739ed17480fd38 (patch) | |
| tree | a6de80eed5413b32cf41bcb73d108a8f11253c8e /fs | |
| parent | 7a16d387dda10ecc0c4fbf086b89bfb1eb84d9c2 (diff) | |
| parent | a74ea43df1afc68f265c0ac2cb64031d855ae97b (diff) | |
| download | op-kernel-dev-f7d222ea2ac7aebf1ac06a76e7739ed17480fd38.zip op-kernel-dev-f7d222ea2ac7aebf1ac06a76e7739ed17480fd38.tar.gz | |
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
of/promtree: allow DT device matching by fixing 'name' brokenness (v5)
x86: OLPC: have prom_early_alloc BUG rather than return NULL
of/flattree: Drop an uninteresting message to pr_debug level
of: Add missing of_address.h to xilinx ehci driver
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/proc_devtree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index d9396a4..927cbd1 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); |
