diff options
Diffstat (limited to 'arch/unicore32/kernel/pci.c')
-rw-r--r-- | arch/unicore32/kernel/pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index a8f07fe10ca..2fc2b1ba825 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | 22 | ||
23 | static int debug_pci; | 23 | static int debug_pci; |
24 | static int use_firmware; | ||
25 | 24 | ||
26 | #define CONFIG_CMD(bus, devfn, where) \ | 25 | #define CONFIG_CMD(bus, devfn, where) \ |
27 | (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) | 26 | (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3)) |
@@ -276,7 +275,7 @@ static int __init pci_common_init(void) | |||
276 | 275 | ||
277 | pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); | 276 | pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); |
278 | 277 | ||
279 | if (!use_firmware) { | 278 | if (!pci_has_flag(PCI_PROBE_ONLY)) { |
280 | /* | 279 | /* |
281 | * Size the bridge windows. | 280 | * Size the bridge windows. |
282 | */ | 281 | */ |
@@ -303,7 +302,7 @@ char * __devinit pcibios_setup(char *str) | |||
303 | debug_pci = 1; | 302 | debug_pci = 1; |
304 | return NULL; | 303 | return NULL; |
305 | } else if (!strcmp(str, "firmware")) { | 304 | } else if (!strcmp(str, "firmware")) { |
306 | use_firmware = 1; | 305 | pci_add_flags(PCI_PROBE_ONLY); |
307 | return NULL; | 306 | return NULL; |
308 | } | 307 | } |
309 | return str; | 308 | return str; |