From c0a623743333754f2188ea28664b05a1675ea0ef Mon Sep 17 00:00:00 2001
From: Mike Ditto <mditto@consentry.com>
Date: Tue, 21 Oct 2008 11:32:29 +0000
Subject: [PATCH] --- yaml --- r: 116966 b: refs/heads/master c:
 71773f0337bee8a3701aaaec22581c18a5f44679 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/powerpc/boot/libfdt-wrapper.c | 6 ++++++
 trunk/arch/powerpc/boot/ops.h            | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ba83796824e1..b2758627458c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201bdc868d9e3122bbe4491aa6b5fc4dee4cdb96
+refs/heads/master: 71773f0337bee8a3701aaaec22581c18a5f44679
diff --git a/trunk/arch/powerpc/boot/libfdt-wrapper.c b/trunk/arch/powerpc/boot/libfdt-wrapper.c
index 1daa73f08ba8..9276327bc2bb 100644
--- a/trunk/arch/powerpc/boot/libfdt-wrapper.c
+++ b/trunk/arch/powerpc/boot/libfdt-wrapper.c
@@ -105,6 +105,11 @@ static int fdt_wrapper_setprop(const void *devp, const char *name,
 	return check_err(rc);
 }
 
+static int fdt_wrapper_del_node(const void *devp)
+{
+	return fdt_del_node(fdt, devp_offset(devp));
+}
+
 static void *fdt_wrapper_get_parent(const void *devp)
 {
 	return offset_devp(fdt_parent_offset(fdt, devp_offset(devp)));
@@ -174,6 +179,7 @@ void fdt_init(void *blob)
 	dt_ops.create_node = fdt_wrapper_create_node;
 	dt_ops.find_node_by_prop_value = fdt_wrapper_find_node_by_prop_value;
 	dt_ops.find_node_by_compatible = fdt_wrapper_find_node_by_compatible;
+	dt_ops.del_node = fdt_wrapper_del_node;
 	dt_ops.get_path = fdt_wrapper_get_path;
 	dt_ops.finalize = fdt_wrapper_finalize;
 
diff --git a/trunk/arch/powerpc/boot/ops.h b/trunk/arch/powerpc/boot/ops.h
index 321e2f5afe71..b3218ce451bb 100644
--- a/trunk/arch/powerpc/boot/ops.h
+++ b/trunk/arch/powerpc/boot/ops.h
@@ -40,6 +40,7 @@ struct dt_ops {
 			const int buflen);
 	int	(*setprop)(const void *phandle, const char *name,
 			const void *buf, const int buflen);
+	int (*del_node)(const void *phandle);
 	void *(*get_parent)(const void *phandle);
 	/* The node must not already exist. */
 	void *(*create_node)(const void *parent, const char *name);
@@ -126,6 +127,11 @@ static inline int setprop_str(void *devp, const char *name, const char *buf)
 	return -1;
 }
 
+static inline int del_node(const void *devp)
+{
+	return dt_ops.del_node ? dt_ops.del_node(devp) : -1;
+}
+
 static inline void *get_parent(const char *devp)
 {
 	return dt_ops.get_parent ? dt_ops.get_parent(devp) : NULL;