From c1d88eff92bd9018b4a034055c12abb37216df8a Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Sun, 14 Feb 2010 07:13:52 -0700
Subject: [PATCH] --- yaml --- r: 180947 b: refs/heads/master c:
 22d5579e66101162fd1119f2e7f4f999ca8b48c7 h: refs/heads/master i:   180945:
 6a77f6ce2664fa595997f11a6b586270b27f288c   180943:
 38efbb738909825957c38f2be96ef46be2ab8f2a v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/microblaze/include/asm/prom.h | 2 --
 trunk/arch/powerpc/kernel/prom.c         | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5db6aa072b19..8493ba6d4b3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c7b60cb87547b1664a4385c187f029bf514a737
+refs/heads/master: 22d5579e66101162fd1119f2e7f4f999ca8b48c7
diff --git a/trunk/arch/microblaze/include/asm/prom.h b/trunk/arch/microblaze/include/asm/prom.h
index ddc5c57eb240..8b1ebd39971a 100644
--- a/trunk/arch/microblaze/include/asm/prom.h
+++ b/trunk/arch/microblaze/include/asm/prom.h
@@ -30,8 +30,6 @@ extern struct device_node *of_chosen;
 
 #define HAVE_ARCH_DEVTREE_FIXUPS
 
-extern rwlock_t devtree_lock;	/* temporary while merging */
-
 /* Other Prototypes */
 extern int early_uartlite_console(void);
 
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
index 5bbbdb29f603..4869c937b6cf 100644
--- a/trunk/arch/powerpc/kernel/prom.c
+++ b/trunk/arch/powerpc/kernel/prom.c
@@ -67,8 +67,6 @@ int __initdata iommu_force_on;
 unsigned long tce_alloc_start, tce_alloc_end;
 #endif
 
-extern rwlock_t devtree_lock;	/* temporary while merging */
-
 /* export that to outside world */
 struct device_node *of_chosen;