diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-02 21:30:03 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-02 21:30:03 -0500 |
| commit | 652e8f8d579d61745094e36b4ff085026a332e73 (patch) | |
| tree | 44145576f9cdf0b777dee0d0961f5499ea88bec8 /arch/powerpc/sysdev | |
| parent | 501cb16d3cfdcca99ac26fe122079f2a43b046b8 (diff) | |
| parent | 6c7120902305b3a21460cd2f0f917a39307df566 (diff) | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index 77fae5f64f2e..ef0fafcbfbcb 100644 --- a/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/arch/powerpc/sysdev/ppc4xx_pci.c | |||
| @@ -1822,6 +1822,8 @@ static int __init ppc4xx_pci_find_bridges(void) | |||
| 1822 | { | 1822 | { |
| 1823 | struct device_node *np; | 1823 | struct device_node *np; |
| 1824 | 1824 | ||
| 1825 | ppc_pci_flags |= PPC_PCI_ENABLE_PROC_DOMAINS | PPC_PCI_COMPAT_DOMAIN_0; | ||
| 1826 | |||
| 1825 | #ifdef CONFIG_PPC4xx_PCI_EXPRESS | 1827 | #ifdef CONFIG_PPC4xx_PCI_EXPRESS |
| 1826 | for_each_compatible_node(np, NULL, "ibm,plb-pciex") | 1828 | for_each_compatible_node(np, NULL, "ibm,plb-pciex") |
| 1827 | ppc4xx_probe_pciex_bridge(np); | 1829 | ppc4xx_probe_pciex_bridge(np); |