From 4de780c70a7d0bdf985985a62845a410ab2a13b1 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Sun, 14 Feb 2010 14:13:57 -0700
Subject: [PATCH] --- yaml --- r: 180949 b: refs/heads/master c:
 0d351c3e932c2e155ef5e4c3f5b87223abd4eea6 h: refs/heads/master i:   180947:
 c1d88eff92bd9018b4a034055c12abb37216df8a v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sparc/kernel/prom.h | 3 ---
 trunk/include/linux/of.h       | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 02a9ddab966b..ecc198bd5bfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc0bdae49d810e4cb32d7b547bc6d4dfb08f9e2e
+refs/heads/master: 0d351c3e932c2e155ef5e4c3f5b87223abd4eea6
diff --git a/trunk/arch/sparc/kernel/prom.h b/trunk/arch/sparc/kernel/prom.h
index 453397fe5e14..a8591ef2636d 100644
--- a/trunk/arch/sparc/kernel/prom.h
+++ b/trunk/arch/sparc/kernel/prom.h
@@ -4,9 +4,6 @@
 #include <linux/spinlock.h>
 #include <asm/prom.h>
 
-extern struct device_node *allnodes;	/* temporary while merging */
-extern rwlock_t devtree_lock;	/* temporary while merging */
-
 extern void * prom_early_alloc(unsigned long size);
 extern void irq_trans_init(struct device_node *dp);
 
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index d34cc5d9d81e..f6d9cbc39c9c 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -19,6 +19,7 @@
 #include <linux/bitops.h>
 #include <linux/kref.h>
 #include <linux/mod_devicetable.h>
+#include <linux/spinlock.h>
 
 #include <asm/byteorder.h>
 
@@ -67,6 +68,7 @@ struct device_node {
 /* Pointer for first entry in chain of all nodes. */
 extern struct device_node *allnodes;
 extern struct device_node *of_chosen;
+extern rwlock_t devtree_lock;
 
 static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
 {