diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-24 04:18:58 +0100 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-24 04:18:58 +0100 |
commit | 673c975624895c4db2edff32601d9c6475b2d39e (patch) | |
tree | d446b54ea15a6706a0ea8fd4c3a856ccd0596da6 /arch/powerpc/kernel/pci-common.c | |
parent | powerpc/PCI: make pci_probe_only default to 0 (diff) | |
download | linux-673c975624895c4db2edff32601d9c6475b2d39e.tar.xz linux-673c975624895c4db2edff32601d9c6475b2d39e.zip |
powerpc/PCI: replace pci_probe_only with pci_flags
We already use pci_flags, so this just sets pci_flags directly and removes
the intermediate step of figuring out pci_probe_only, then using it to set
pci_flags.
The PCI core provides a pci_flags definition (currently __weak), so drop
the powerpc definitions in favor of that.
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
-rw-r--r-- | arch/powerpc/kernel/pci-common.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index cce98d76e905..6d03da475572 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -50,9 +50,6 @@ static int global_phb_number; /* Global phb counter */ /* ISA Memory physical address */ resource_size_t isa_mem_base; -/* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */ -unsigned int pci_flags = 0; - static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; |