diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:12:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:12:10 -0400 |
| commit | 3960ef326a1838971466193ffa008ff37c1d978d (patch) | |
| tree | 282b74377bccb9fa79639ce4df2dcb48652dbdec /arch/powerpc/sysdev/ppc4xx_pci.c | |
| parent | 62c9072bee2272232d0ed92dc8148c48c1f10f8e (diff) | |
| parent | c8f85523e70f8202ff49858bacd72fa65245f382 (diff) | |
Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
ARM: Consolidate the clkdev header files
ARM: set vga memory base at run-time
ARM: convert PCI defines to variables
ARM: pci: make pcibios_assign_all_busses use pci_has_flag
ARM: remove unnecessary mach/hardware.h includes
pci: move microblaze and powerpc pci flag functions into asm-generic
powerpc: rename ppc_pci_*_flags to pci_*_flags
Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h
Diffstat (limited to 'arch/powerpc/sysdev/ppc4xx_pci.c')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index 2ec4f3bb8160..a59ba96d2c21 100644 --- 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) | |||
| 1977 | { | 1977 | { |
| 1978 | struct device_node *np; | 1978 | struct device_node *np; |
| 1979 | 1979 | ||
| 1980 | ppc_pci_flags |= PPC_PCI_ENABLE_PROC_DOMAINS | PPC_PCI_COMPAT_DOMAIN_0; | 1980 | pci_add_flags(PCI_ENABLE_PROC_DOMAINS | PCI_COMPAT_DOMAIN_0); |
| 1981 | 1981 | ||
| 1982 | #ifdef CONFIG_PPC4xx_PCI_EXPRESS | 1982 | #ifdef CONFIG_PPC4xx_PCI_EXPRESS |
| 1983 | for_each_compatible_node(np, NULL, "ibm,plb-pciex") | 1983 | for_each_compatible_node(np, NULL, "ibm,plb-pciex") |