leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag

Browse Source 
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel@lists.infradead.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2012-02-23 20:18:57 -07:00
parent 6696cbc39d
commit a4fab0449e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/kernel/bios32.c
View File

@ -16,7 +16,6 @@
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
static int debug_pci; static int debug_pci;
static int use_firmware;
/* /*
* We can't use pci_find_device() here since we are * We can't use pci_find_device() here since we are
@ -537,7 +536,7 @@ void __init pci_common_init(struct hw_pci *hw)
list_for_each_entry(sys, &hw->buses, node) { list_for_each_entry(sys, &hw->buses, node) {
struct pci_bus *bus = sys->bus; struct pci_bus *bus = sys->bus;
if (!use_firmware) { if (!pci_has_flag(PCI_PROBE_ONLY)) {
/* /*
* Size the bridge windows. * Size the bridge windows.
*/ */
@ -575,7 +574,7 @@ char * __init pcibios_setup(char *str)
debug_pci = 1; debug_pci = 1;
return NULL; return NULL;
} else if (!strcmp(str, "firmware")) { } else if (!strcmp(str, "firmware")) {
use_firmware = 1; pci_add_flags(PCI_PROBE_ONLY);
return NULL; return NULL;
} }
return str; return str;