git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
mmio_nvram.c
diff --git
a/arch/powerpc/sysdev/mmio_nvram.c
b/arch/powerpc/sysdev/mmio_nvram.c
index
2073242
..
ddc877a
100644
(file)
--- a/
arch/powerpc/sysdev/mmio_nvram.c
+++ b/
arch/powerpc/sysdev/mmio_nvram.c
@@
-115,6
+115,8
@@
int __init mmio_nvram_init(void)
int ret;
nvram_node = of_find_node_by_type(NULL, "nvram");
+ if (!nvram_node)
+ nvram_node = of_find_compatible_node(NULL, NULL, "nvram");
if (!nvram_node) {
printk(KERN_WARNING "nvram: no node found in device-tree\n");
return -ENODEV;