From 9e2570c9535236155e2723894124578a3de53c3f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 21 Jun 2006 23:07:29 -0700
Subject: [PATCH] --- yaml --- r: 29555 b: refs/heads/master c:
 6d307724cb6a6b8466cad4fdf13d8a409bc2433f h: refs/heads/master i:   29553:
 88c3ceb3bf2887a6449506bb6860627f3f2de8c4   29551:
 c4bedd464c04b4814ade152b472d6d321c12f7c0 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/sparc64/kernel/prom.c | 12 ++++++++++++
 trunk/include/asm-sparc64/prom.h |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 180a06a7d13d..6156affb4d59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6760d28bc691bb255c501c9b680f2fc1162258b2
+refs/heads/master: 6d307724cb6a6b8466cad4fdf13d8a409bc2433f
diff --git a/trunk/arch/sparc64/kernel/prom.c b/trunk/arch/sparc64/kernel/prom.c
index fd46e94ce06b..0a32b1064dfb 100644
--- a/trunk/arch/sparc64/kernel/prom.c
+++ b/trunk/arch/sparc64/kernel/prom.c
@@ -104,6 +104,18 @@ struct property *of_find_property(struct device_node *np, const char *name,
 	return pp;
 }
 
+int of_getintprop_default(struct device_node *np, const char *name, int def)
+{
+	struct property *prop;
+	int len;
+
+	prop = of_find_property(np, name, &len);
+	if (!prop || len != 4)
+		return def;
+
+	return *(int *) prop->value;
+}
+
 static unsigned int prom_early_allocated;
 
 static void * __init prom_early_alloc(unsigned long size)
diff --git a/trunk/include/asm-sparc64/prom.h b/trunk/include/asm-sparc64/prom.h
index eb75d3cbcf4c..d0187b3a0ec3 100644
--- a/trunk/include/asm-sparc64/prom.h
+++ b/trunk/include/asm-sparc64/prom.h
@@ -82,6 +82,9 @@ extern struct device_node *of_get_next_child(const struct device_node *node,
 extern struct property *of_find_property(struct device_node *np,
 					 const char *name,
 					 int *lenp);
+extern int of_getintprop_default(struct device_node *np,
+				 const char *name,
+				 int def);
 
 extern void prom_build_devicetree(void);