diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
commit | b9c40b076c9d247494f91521e3beff9422cd1173 (patch) | |
tree | c820fb55bc7bdb2af4275f6006bcad443e9369b7 /arch/unicore32 | |
parent | 673c975624895c4db2edff32601d9c6475b2d39e (diff) |
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 @@ | |||
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | #include <asm-generic/pci-bridge.h> | ||
22 | 23 | ||
23 | static int debug_pci; | 24 | static int debug_pci; |
24 | static int use_firmware; | ||
25 | 25 | ||
26 | #define CONFIG_CMD(bus, devfn, where) \ | 26 | #define CONFIG_CMD(bus, devfn, where) \ |
27 | (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) | 27 | (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) |
@@ -276,7 +276,7 @@ static int __init pci_common_init(void) | |||
276 | 276 | ||
277 | pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); | 277 | pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); |
278 | 278 | ||
279 | if (!use_firmware) { | 279 | if (!pci_has_flag(PCI_PROBE_ONLY)) { |
280 | /* | 280 | /* |
281 | * Size the bridge windows. | 281 | * Size the bridge windows. |
282 | */ | 282 | */ |
@@ -303,7 +303,7 @@ char * __devinit pcibios_setup(char *str) | |||
303 | debug_pci = 1; | 303 | debug_pci = 1; |
304 | return NULL; | 304 | return NULL; |
305 | } else if (!strcmp(str, "firmware")) { | 305 | } else if (!strcmp(str, "firmware")) { |
306 | use_firmware = 1; | 306 | pci_add_flags(PCI_PROBE_ONLY); |
307 | return NULL; | 307 | return NULL; |
308 | } | 308 | } |
309 | return str; | 309 | return str; |