diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
| commit | 253412624e0fa60a309c6691b0cd99b6c341df87 (patch) | |
| tree | d261ea96f8b29388beb93ec1b05b7b972aa548c1 /drivers/of | |
| parent | 6191ef93b25edbd75caec9213db3665f486ee433 (diff) | |
| parent | c35624d1946a4756c93bdb489f4790176b6e2dcc (diff) | |
| download | barebox-253412624e0fa60a309c6691b0cd99b6c341df87.tar.gz barebox-253412624e0fa60a309c6691b0cd99b6c341df87.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index c9bdd91810..33f61622ae 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1910,6 +1910,8 @@ int of_probe(void) barebox_set_model(of_model); memory = of_find_node_by_path("/memory"); + if (!memory) + memory = of_find_node_by_type(root_node, "memory"); if (memory) of_add_memory(memory, false); |