Commit 7501ea7e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

PCI: fixed remaining usages of pcibios_present() that I missed previously.

parent 36be8435
...@@ -1993,7 +1993,7 @@ int __init rp_init(void) ...@@ -1993,7 +1993,7 @@ int __init rp_init(void)
isa_boards_found++; isa_boards_found++;
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
if (pcibios_present()) { if (pci_present()) {
if(isa_boards_found < NUM_BOARDS) if(isa_boards_found < NUM_BOARDS)
pci_boards_found = init_PCI(isa_boards_found); pci_boards_found = init_PCI(isa_boards_found);
} else { } else {
......
...@@ -312,7 +312,7 @@ static int __init sbus_init(void) ...@@ -312,7 +312,7 @@ static int __init sbus_init(void)
nd = prom_searchsiblings(topnd, "sbus"); nd = prom_searchsiblings(topnd, "sbus");
if(nd == 0) { if(nd == 0) {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
if (!pcibios_present()) { if (!pci_present()) {
prom_printf("Neither SBUS nor PCI found.\n"); prom_printf("Neither SBUS nor PCI found.\n");
prom_halt(); prom_halt();
} else { } else {
......
...@@ -208,7 +208,7 @@ int orc_ReturnNumberOfAdapters(void) ...@@ -208,7 +208,7 @@ int orc_ReturnNumberOfAdapters(void)
/* /*
* PCI-bus probe. * PCI-bus probe.
*/ */
if (pcibios_present()) { if (pci_present()) {
/* /*
* Note: I removed the struct pci_device_list stuff since this * Note: I removed the struct pci_device_list stuff since this
* driver only cares about one device ID. If that changes in * driver only cares about one device ID. If that changes in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment