aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-02-14 09:13:55 -0500
committerGrant Likely <grant.likely@secretlab.ca>2010-02-14 09:13:55 -0500
commitfc0bdae49d810e4cb32d7b547bc6d4dfb08f9e2e (patch)
tree081821a0091b3c0301d66d1b692b6e3ccea83056 /arch
parent22d5579e66101162fd1119f2e7f4f999ca8b48c7 (diff)
of: move definition of of_chosen into common code.
Rather than defining of_chosen in each arch, it can be defined for all in driver/of/base.c Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/include/asm/prom.h2
-rw-r--r--arch/microblaze/kernel/prom.c3
-rw-r--r--arch/powerpc/include/asm/prom.h2
-rw-r--r--arch/powerpc/kernel/prom.c3
4 files changed, 0 insertions, 10 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 8b1ebd39971a..aa1a437ac87d 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -26,8 +26,6 @@
26#include <asm/irq.h> 26#include <asm/irq.h>
27#include <asm/atomic.h> 27#include <asm/atomic.h>
28 28
29extern struct device_node *of_chosen;
30
31#define HAVE_ARCH_DEVTREE_FIXUPS 29#define HAVE_ARCH_DEVTREE_FIXUPS
32 30
33/* Other Prototypes */ 31/* Other Prototypes */
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index a7dcaf092200..a15ef6d67ca9 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -42,9 +42,6 @@
42#include <asm/sections.h> 42#include <asm/sections.h>
43#include <asm/pci-bridge.h> 43#include <asm/pci-bridge.h>
44 44
45/* export that to outside world */
46struct device_node *of_chosen;
47
48void __init early_init_dt_scan_chosen_arch(unsigned long node) 45void __init early_init_dt_scan_chosen_arch(unsigned long node)
49{ 46{
50 /* No Microblaze specific code here */ 47 /* No Microblaze specific code here */
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 4a5070edb4d3..7f9a50aab157 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -23,8 +23,6 @@
23#include <asm/irq.h> 23#include <asm/irq.h>
24#include <asm/atomic.h> 24#include <asm/atomic.h>
25 25
26extern struct device_node *of_chosen;
27
28#define HAVE_ARCH_DEVTREE_FIXUPS 26#define HAVE_ARCH_DEVTREE_FIXUPS
29 27
30#ifdef CONFIG_PPC32 28#ifdef CONFIG_PPC32
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 4869c937b6cf..43238b2054b6 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -67,9 +67,6 @@ int __initdata iommu_force_on;
67unsigned long tce_alloc_start, tce_alloc_end; 67unsigned long tce_alloc_start, tce_alloc_end;
68#endif 68#endif
69 69
70/* export that to outside world */
71struct device_node *of_chosen;
72
73static int __init early_parse_mem(char *p) 70static int __init early_parse_mem(char *p)
74{ 71{
75 if (!p) 72 if (!p)