git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
of_platform.c
diff --git
a/arch/powerpc/kernel/of_platform.c
b/arch/powerpc/kernel/of_platform.c
index
3f37a6e
..
1a4fc0d
100644
(file)
--- a/
arch/powerpc/kernel/of_platform.c
+++ b/
arch/powerpc/kernel/of_platform.c
@@
-76,7
+76,7
@@
struct of_device* of_platform_device_create(struct device_node *np,
return NULL;
dev->dma_mask = 0xffffffffUL;
return NULL;
dev->dma_mask = 0xffffffffUL;
- dev->dev.coherent_dma_mask = DMA_
32BIT_MASK
;
+ dev->dev.coherent_dma_mask = DMA_
BIT_MASK(32)
;
dev->dev.bus = &of_platform_bus_type;
dev->dev.bus = &of_platform_bus_type;
@@
-276,7
+276,7
@@
static int __devinit of_pci_phb_probe(struct of_device *dev,
#endif /* CONFIG_EEH */
/* Scan the bus */
#endif /* CONFIG_EEH */
/* Scan the bus */
-
scan_phb(phb
);
+
pcibios_scan_phb(phb, dev->node
);
if (phb->bus == NULL)
return -ENXIO;
if (phb->bus == NULL)
return -ENXIO;