diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:57 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:57 -0500 |
commit | a4fab0449eb2213e426bf210126fa0f1129ca9a3 (patch) | |
tree | e6be67cc7513d730f81d829f9afd3e57b8591124 /arch/arm/kernel/bios32.c | |
parent | 6696cbc39dff488dbe04d80d74023d8766a15e70 (diff) |
arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel@lists.infradead.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/arm/kernel/bios32.c')
-rw-r--r-- | arch/arm/kernel/bios32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index f3fd52b33e3d..8d7c22d7dff8 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <asm/mach/pci.h> | 16 | #include <asm/mach/pci.h> |
17 | 17 | ||
18 | static int debug_pci; | 18 | static int debug_pci; |
19 | static int use_firmware; | ||
20 | 19 | ||
21 | /* | 20 | /* |
22 | * We can't use pci_find_device() here since we are | 21 | * We can't use pci_find_device() here since we are |
@@ -537,7 +536,7 @@ void __init pci_common_init(struct hw_pci *hw) | |||
537 | list_for_each_entry(sys, &hw->buses, node) { | 536 | list_for_each_entry(sys, &hw->buses, node) { |
538 | struct pci_bus *bus = sys->bus; | 537 | struct pci_bus *bus = sys->bus; |
539 | 538 | ||
540 | if (!use_firmware) { | 539 | if (!pci_has_flag(PCI_PROBE_ONLY)) { |
541 | /* | 540 | /* |
542 | * Size the bridge windows. | 541 | * Size the bridge windows. |
543 | */ | 542 | */ |
@@ -575,7 +574,7 @@ char * __init pcibios_setup(char *str) | |||
575 | debug_pci = 1; | 574 | debug_pci = 1; |
576 | return NULL; | 575 | return NULL; |
577 | } else if (!strcmp(str, "firmware")) { | 576 | } else if (!strcmp(str, "firmware")) { |
578 | use_firmware = 1; | 577 | pci_add_flags(PCI_PROBE_ONLY); |
579 | return NULL; | 578 | return NULL; |
580 | } | 579 | } |
581 | return str; | 580 | return str; |