summaryrefslogtreecommitdiffstats
path: root/arch/unicore32/kernel/pci.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2012-02-24 14:25:33 -0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-24 14:25:33 -0800
commitecd58d667a6ac4350d2f67b9accaadf575bae4b0 (patch)
tree5209771a0a1f61820171e444d3e4a580ecf3955f /arch/unicore32/kernel/pci.c
parentb07f2ebc109b607789f648dedcff4b125f9afec6 (diff)
parentfb127cb9de791d62fb393d6e65fa9869bddd2460 (diff)
downloadop-kernel-dev-ecd58d667a6ac4350d2f67b9accaadf575bae4b0.zip
op-kernel-dev-ecd58d667a6ac4350d2f67b9accaadf575bae4b0.tar.gz
Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next
Diffstat (limited to 'arch/unicore32/kernel/pci.c')
-rw-r--r--arch/unicore32/kernel/pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
index a8f07fe..6c1248f 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;
OpenPOWER on IntegriCloud