summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-02-14 15:13:52 +0100
committerGrant Likely <grant.likely@secretlab.ca>2010-02-14 15:13:52 +0100
commit22d5579e66101162fd1119f2e7f4f999ca8b48c7 (patch)
treece9d3db64c67ec777c8415443fb39234953e1d5d
parentof: put default string compare and #a/s-cell values into common header (diff)
downloadlinux-22d5579e66101162fd1119f2e7f4f999ca8b48c7.tar.xz
linux-22d5579e66101162fd1119f2e7f4f999ca8b48c7.zip
of: remove unused extern reference to devtree_lock
Neither the powerpc nor the microblaze code use devtree_lock anymore. Remove the extern reference. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Michal Simek <monstr@monstr.eu>
-rw-r--r--arch/microblaze/include/asm/prom.h2
-rw-r--r--arch/powerpc/kernel/prom.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index ddc5c57eb240..8b1ebd39971a 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/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/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 5bbbdb29f603..4869c937b6cf 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/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;