From afdad0a7a500ae33056db6625c5cfa69d6279d6b Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Thu, 15 Oct 2009 10:57:46 -0600
Subject: [PATCH] --- yaml --- r: 170043 b: refs/heads/master c:
 731581e6a653f6a68a4d7ba9df6b886a85c7d080 h: refs/heads/master i:   170041:
 7bbf5471cffb8e9c5ea0c9c18140ef4232386d59   170039:
 d9ce5c10ef92577820739ba789164d4c1c8ac755 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/microblaze/include/asm/prom.h | 10 ----------
 trunk/arch/powerpc/include/asm/prom.h    | 12 ------------
 trunk/arch/sparc/include/asm/prom.h      | 12 ------------
 trunk/include/linux/of.h                 | 12 ++++++++++++
 5 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index af30841b78ce..b79f1eb58913 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d24c888c779c877f1baf5a73e0cec78266ff7bb
+refs/heads/master: 731581e6a653f6a68a4d7ba9df6b886a85c7d080
diff --git a/trunk/arch/microblaze/include/asm/prom.h b/trunk/arch/microblaze/include/asm/prom.h
index 66368896f922..11cb48419c7d 100644
--- a/trunk/arch/microblaze/include/asm/prom.h
+++ b/trunk/arch/microblaze/include/asm/prom.h
@@ -73,16 +73,6 @@ struct boot_param_header {
 	u32	dt_struct_size; /* size of the DT structure block */
 };
 
-typedef u32 phandle;
-typedef u32 ihandle;
-
-struct property {
-	char	*name;
-	int	length;
-	void	*value;
-	struct property *next;
-};
-
 struct device_node {
 	const char *name;
 	const char *type;
diff --git a/trunk/arch/powerpc/include/asm/prom.h b/trunk/arch/powerpc/include/asm/prom.h
index b0a84ea5f8ed..c236326177a8 100644
--- a/trunk/arch/powerpc/include/asm/prom.h
+++ b/trunk/arch/powerpc/include/asm/prom.h
@@ -71,18 +71,6 @@ struct boot_param_header
 	u32	dt_struct_size;		/* size of the DT structure block */
 };
 
-
-
-typedef u32 phandle;
-typedef u32 ihandle;
-
-struct property {
-	char	*name;
-	int	length;
-	void	*value;
-	struct property *next;
-};
-
 struct device_node {
 	const char *name;
 	const char *type;
diff --git a/trunk/arch/sparc/include/asm/prom.h b/trunk/arch/sparc/include/asm/prom.h
index 0733170e02ca..b34f988a2aad 100644
--- a/trunk/arch/sparc/include/asm/prom.h
+++ b/trunk/arch/sparc/include/asm/prom.h
@@ -29,18 +29,6 @@
 #define of_prop_cmp(s1, s2)		strcasecmp((s1), (s2))
 #define of_node_cmp(s1, s2)		strcmp((s1), (s2))
 
-typedef u32 phandle;
-typedef u32 ihandle;
-
-struct property {
-	char	*name;
-	int	length;
-	void	*value;
-	struct property *next;
-	unsigned long _flags;
-	unsigned int unique_id;
-};
-
 struct of_irq_controller;
 struct device_node {
 	const char	*name;
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index 7be2d1043c16..4668b298479a 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -19,6 +19,18 @@
 #include <linux/bitops.h>
 #include <linux/mod_devicetable.h>
 
+typedef u32 phandle;
+typedef u32 ihandle;
+
+struct property {
+	char	*name;
+	int	length;
+	void	*value;
+	struct property *next;
+	unsigned long _flags;
+	unsigned int unique_id;
+};
+
 #include <asm/prom.h>
 
 /* flag descriptions */