From e5092bc341f319f8d15f585673a851aaf5f40703 Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@queued.net>
Date: Thu, 17 Mar 2011 17:32:35 -0700
Subject: [PATCH] --- yaml --- r: 241727 b: refs/heads/master c:
 a7006c9747ef225ab070d96c054e85682a09a13e h: refs/heads/master i:   241725:
 a855dba90f5d996e2b6ddf807305e8f9d803efd6   241723:
 b6c5be1fcb0b7535280e3ad0a2968a1a0dbc5e09   241719:
 ec4059177175d65a1503732b6202a225124a39b8   241711:
 24be28de7b92ef78341f148d361f5bd55f56c810   241695:
 c29c44046de9a5e286fca5af02354b0b8bb7ded1   241663:
 83152cc060e8515b41cdeca93ae672cd223af763 v: v3

---
 [refs]                 | 2 +-
 trunk/drivers/of/fdt.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ff3f8c26031c..d3ab48ae6700 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1eed4c077c31450bfcd0249aebb21d96fc5d5d3c
+refs/heads/master: a7006c9747ef225ab070d96c054e85682a09a13e
diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c
index af824e7e0367..c9db49c10f45 100644
--- a/trunk/drivers/of/fdt.c
+++ b/trunk/drivers/of/fdt.c
@@ -139,12 +139,13 @@ static void *unflatten_dt_alloc(unsigned long *mem, unsigned long size,
 /**
  * unflatten_dt_node - Alloc and populate a device_node from the flat tree
  * @blob: The parent device tree blob
+ * @mem: Memory chunk to use for allocating device nodes and properties
  * @p: pointer to node in flat tree
  * @dad: Parent struct device_node
  * @allnextpp: pointer to ->allnext from last allocated device_node
  * @fpsize: Size of the node path up at the current depth.
  */
-unsigned long unflatten_dt_node(struct boot_param_header *blob,
+static unsigned long unflatten_dt_node(struct boot_param_header *blob,
 				unsigned long mem,
 				unsigned long *p,
 				struct device_node *dad,
@@ -230,6 +231,7 @@ unsigned long unflatten_dt_node(struct boot_param_header *blob,
 		}
 		kref_init(&np->kref);
 	}
+	/* process properties */
 	while (1) {
 		u32 sz, noff;
 		char *pname;
@@ -351,7 +353,7 @@ unsigned long unflatten_dt_node(struct boot_param_header *blob,
  * @dt_alloc: An allocator that provides a virtual address to memory
  * for the resulting tree
  */
-void __unflatten_device_tree(struct boot_param_header *blob,
+static void __unflatten_device_tree(struct boot_param_header *blob,
 			     struct device_node **mynodes,
 			     void * (*dt_alloc)(u64 size, u64 align))
 {