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
/
sysdev
/
ppc4xx_pci.c
diff --git
a/arch/powerpc/sysdev/ppc4xx_pci.c
b/arch/powerpc/sysdev/ppc4xx_pci.c
index
2ec4f3b
..
a59ba96
100644
(file)
--- a/
arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/
arch/powerpc/sysdev/ppc4xx_pci.c
@@
-1977,7
+1977,7
@@
static int __init ppc4xx_pci_find_bridges(void)
{
struct device_node *np;
- p
pc_pci_flags |= PPC_PCI_ENABLE_PROC_DOMAINS | PPC_PCI_COMPAT_DOMAIN_0
;
+ p
ci_add_flags(PCI_ENABLE_PROC_DOMAINS | PCI_COMPAT_DOMAIN_0)
;
#ifdef CONFIG_PPC4xx_PCI_EXPRESS
for_each_compatible_node(np, NULL, "ibm,plb-pciex")