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 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
chrp
/
pci.c
diff --git
a/arch/powerpc/platforms/chrp/pci.c
b/arch/powerpc/platforms/chrp/pci.c
index
3f65443
..
83285c5
100644
(file)
--- a/
arch/powerpc/platforms/chrp/pci.c
+++ b/
arch/powerpc/platforms/chrp/pci.c
@@
-199,7
+199,7
@@
static void __init setup_peg2(struct pci_controller *hose, struct device_node *d
printk ("RTAS supporting Pegasos OF not found, please upgrade"
" your firmware\n");
}
- p
pc_pci_add_flags(PPC_
PCI_REASSIGN_ALL_BUS);
+ p
ci_add_flags(
PCI_REASSIGN_ALL_BUS);
/* keep the reference to the root node */
}