[PATCH] powerpc: some prom.c cleanups
On !CONFIG_PPC_MULTIPLATFORM _machine is defined as 0. This is ok, but
we can't assign a value to _machine then.
We may not have CONFIG_PCI available, so only build in support for
find_parent_pci_resource(), request_OF_resource(), release_OF_resource()
if PCI is enabled. This is probably not the long term fix but works out
for now.
Make reg_property64 contain 64-bit elements on a 32-bit machine.
Mark the deprecated prom.c functions as __deprecated.
Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 69f69c3..8d0c78c 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1167,8 +1167,10 @@
#ifdef CONFIG_PPC64
systemcfg->platform = *prop;
#else
+#ifdef CONFIG_PPC_MULTIPLATFORM
_machine = *prop;
#endif
+#endif
#ifdef CONFIG_PPC64
/* check if iommu is forced on or off */
@@ -2005,6 +2007,7 @@
}
}
+#ifdef CONFIG_PCI
static struct resource *find_parent_pci_resource(struct pci_dev* pdev,
struct address_range *range)
{
@@ -2157,3 +2160,4 @@
return 0;
}
EXPORT_SYMBOL(release_OF_resource);
+#endif /* CONFIG_PCI */