---

yaml --- r: 180937 b: refs/heads/master c: 36b9d30 h: refs/heads/master i: 180935: 22e3638 v: v3
git-mirror · Feb 9, 2010 · cb1d924 · cb1d924
1 parent 5e34b57
commit cb1d924
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1406bc2f57787797d1f6a3675c019a7093769275
+refs/heads/master: 36b9d3070d653af5807cef74ff129721d9047107
diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c
@@ -420,11 +420,11 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname,
 		return 0;
 
 	prop = of_get_flat_dt_prop(node, "#size-cells", NULL);
-	dt_root_size_cells = (prop == NULL) ? 1 : *prop;
+	dt_root_size_cells = prop ? *prop : OF_ROOT_NODE_SIZE_CELLS_DEFAULT;
 	pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells);
 
 	prop = of_get_flat_dt_prop(node, "#address-cells", NULL);
-	dt_root_addr_cells = (prop == NULL) ? 2 : *prop;
+	dt_root_addr_cells = prop ? *prop : OF_ROOT_NODE_ADDR_CELLS_DEFAULT;
 	pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells);
 
 	/* break now */