aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/prom_common.c
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2010-10-10 23:42:33 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-10-10 23:53:30 -0400
commit3cfc535c5df8122af1258ae05aaf2770c033425d (patch)
treec5643066e544df08a852742060da2edfd2f6400d /arch/sparc/kernel/prom_common.c
parent9bdf6bab4ecfb6a8ca50c0c46f2365ef6c3e35b7 (diff)
of/promtree: make drivers/of/pdt.c no longer sparc-only
Clean up pdt.c: - make build dependent upon config OF_PROMTREE - #ifdef out the sparc-specific stuff - create pdt-specific header Signed-off-by: Andres Salomon <dilinger@queued.net> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/sparc/kernel/prom_common.c')
-rw-r--r--arch/sparc/kernel/prom_common.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 7b454f6413f7..fe84d56b7c5a 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -20,6 +20,7 @@
20#include <linux/mutex.h> 20#include <linux/mutex.h>
21#include <linux/slab.h> 21#include <linux/slab.h>
22#include <linux/of.h> 22#include <linux/of.h>
23#include <linux/of_pdt.h>
23#include <asm/prom.h> 24#include <asm/prom.h>
24#include <asm/oplib.h> 25#include <asm/oplib.h>
25#include <asm/leon.h> 26#include <asm/leon.h>
@@ -119,4 +120,11 @@ EXPORT_SYMBOL(of_find_in_proplist);
119 120
120unsigned int prom_early_allocated __initdata; 121unsigned int prom_early_allocated __initdata;
121 122
122#include "../../../drivers/of/pdt.c" 123void __init prom_build_devicetree(void)
124{
125 of_pdt_build_devicetree(prom_root_node);
126 of_console_init();
127
128 pr_info("PROM: Built device tree with %u bytes of memory.\n",
129 prom_early_allocated);
130}