|
@@ -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;
|