diff options
Diffstat (limited to 'arch/x86/pci/common.c')
-rw-r--r-- | arch/x86/pci/common.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 7b6e3bb9b28c..c9ff4ff66739 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
@@ -427,10 +427,6 @@ static int __init pcibios_init(void) | |||
427 | 427 | ||
428 | if (pci_bf_sort >= pci_force_bf) | 428 | if (pci_bf_sort >= pci_force_bf) |
429 | pci_sort_breadthfirst(); | 429 | pci_sort_breadthfirst(); |
430 | #ifdef CONFIG_PCI_BIOS | ||
431 | if ((pci_probe & PCI_BIOS_SORT) && !(pci_probe & PCI_NO_SORT)) | ||
432 | pcibios_sort(); | ||
433 | #endif | ||
434 | return 0; | 430 | return 0; |
435 | } | 431 | } |
436 | 432 | ||
@@ -455,9 +451,6 @@ char * __devinit pcibios_setup(char *str) | |||
455 | } else if (!strcmp(str, "nobios")) { | 451 | } else if (!strcmp(str, "nobios")) { |
456 | pci_probe &= ~PCI_PROBE_BIOS; | 452 | pci_probe &= ~PCI_PROBE_BIOS; |
457 | return NULL; | 453 | return NULL; |
458 | } else if (!strcmp(str, "nosort")) { | ||
459 | pci_probe |= PCI_NO_SORT; | ||
460 | return NULL; | ||
461 | } else if (!strcmp(str, "biosirq")) { | 454 | } else if (!strcmp(str, "biosirq")) { |
462 | pci_probe |= PCI_BIOS_IRQ_SCAN; | 455 | pci_probe |= PCI_BIOS_IRQ_SCAN; |
463 | return NULL; | 456 | return NULL; |