From 88903579c9ab63a0e1166273d262683f4fe3a9ff Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Sun, 14 Feb 2010 07:13:55 -0700
Subject: [PATCH] --- yaml --- r: 180948 b: refs/heads/master c:
 fc0bdae49d810e4cb32d7b547bc6d4dfb08f9e2e h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/microblaze/include/asm/prom.h | 2 --
 trunk/arch/microblaze/kernel/prom.c      | 3 ---
 trunk/arch/powerpc/include/asm/prom.h    | 2 --
 trunk/arch/powerpc/kernel/prom.c         | 3 ---
 trunk/drivers/of/base.c                  | 1 +
 trunk/include/linux/of.h                 | 1 +
 7 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8493ba6d4b3f..02a9ddab966b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22d5579e66101162fd1119f2e7f4f999ca8b48c7
+refs/heads/master: fc0bdae49d810e4cb32d7b547bc6d4dfb08f9e2e
diff --git a/trunk/arch/microblaze/include/asm/prom.h b/trunk/arch/microblaze/include/asm/prom.h
index 8b1ebd39971a..aa1a437ac87d 100644
--- a/trunk/arch/microblaze/include/asm/prom.h
+++ b/trunk/arch/microblaze/include/asm/prom.h
@@ -26,8 +26,6 @@
 #include <asm/irq.h>
 #include <asm/atomic.h>
 
-extern struct device_node *of_chosen;
-
 #define HAVE_ARCH_DEVTREE_FIXUPS
 
 /* Other Prototypes */
diff --git a/trunk/arch/microblaze/kernel/prom.c b/trunk/arch/microblaze/kernel/prom.c
index a7dcaf092200..a15ef6d67ca9 100644
--- a/trunk/arch/microblaze/kernel/prom.c
+++ b/trunk/arch/microblaze/kernel/prom.c
@@ -42,9 +42,6 @@
 #include <asm/sections.h>
 #include <asm/pci-bridge.h>
 
-/* export that to outside world */
-struct device_node *of_chosen;
-
 void __init early_init_dt_scan_chosen_arch(unsigned long node)
 {
 	/* No Microblaze specific code here */
diff --git a/trunk/arch/powerpc/include/asm/prom.h b/trunk/arch/powerpc/include/asm/prom.h
index 4a5070edb4d3..7f9a50aab157 100644
--- a/trunk/arch/powerpc/include/asm/prom.h
+++ b/trunk/arch/powerpc/include/asm/prom.h
@@ -23,8 +23,6 @@
 #include <asm/irq.h>
 #include <asm/atomic.h>
 
-extern struct device_node *of_chosen;
-
 #define HAVE_ARCH_DEVTREE_FIXUPS
 
 #ifdef CONFIG_PPC32
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
index 4869c937b6cf..43238b2054b6 100644
--- a/trunk/arch/powerpc/kernel/prom.c
+++ b/trunk/arch/powerpc/kernel/prom.c
@@ -67,9 +67,6 @@ int __initdata iommu_force_on;
 unsigned long tce_alloc_start, tce_alloc_end;
 #endif
 
-/* export that to outside world */
-struct device_node *of_chosen;
-
 static int __init early_parse_mem(char *p)
 {
 	if (!p)
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 873479a21c80..cb96888d1427 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/drivers/of/base.c
@@ -23,6 +23,7 @@
 #include <linux/proc_fs.h>
 
 struct device_node *allnodes;
+struct device_node *of_chosen;
 
 /* use when traversing tree through the allnext, child, sibling,
  * or parent members of struct device_node.
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index 5cd284002bf1..d34cc5d9d81e 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -66,6 +66,7 @@ struct device_node {
 
 /* Pointer for first entry in chain of all nodes. */
 extern struct device_node *allnodes;
+extern struct device_node *of_chosen;
 
 static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
 {