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 | b9c40b076c9d247494f91521e3beff9422cd1173 (patch) | |
| tree | c820fb55bc7bdb2af4275f6006bcad443e9369b7 /arch/unicore32 | |
| parent | powerpc/PCI: replace pci_probe_only with pci_flags (diff) | |
| download | linux-b9c40b076c9d247494f91521e3beff9422cd1173.tar.xz linux-b9c40b076c9d247494f91521e3beff9422cd1173.zip | |
unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag
CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/kernel/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index a8f07fe10cad..6c1248f5f56a 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -19,9 +19,9 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/io.h> +#include <asm-generic/pci-bridge.h> static int debug_pci; -static int use_firmware; #define CONFIG_CMD(bus, devfn, where) \ (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) @@ -276,7 +276,7 @@ static int __init pci_common_init(void) pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); - if (!use_firmware) { + if (!pci_has_flag(PCI_PROBE_ONLY)) { /* * Size the bridge windows. */ @@ -303,7 +303,7 @@ char * __devinit pcibios_setup(char *str) debug_pci = 1; return NULL; } else if (!strcmp(str, "firmware")) { - use_firmware = 1; + pci_add_flags(PCI_PROBE_ONLY); return NULL; } return str; |