Commit 41986392 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

PCI: remove pci_present() from drivers/telephony/ixj.c

parent 4850a7ab
...@@ -7821,9 +7821,6 @@ int __init ixj_probe_pci(int *cnt) ...@@ -7821,9 +7821,6 @@ int __init ixj_probe_pci(int *cnt)
IXJ *j = NULL; IXJ *j = NULL;
int result; int result;
if(!pci_present())
return 0;
for (i = 0; i < IXJMAX - *cnt; i++) { for (i = 0; i < IXJMAX - *cnt; i++) {
pci = pci_find_device(0x15E2, 0x0500, pci); pci = pci_find_device(0x15E2, 0x0500, pci);
if (!pci) if (!pci)
...@@ -7869,11 +7866,9 @@ int __init ixj_init(void) ...@@ -7869,11 +7866,9 @@ int __init ixj_init(void)
if ((probe = ixj_probe_isa(&cnt)) < 0) { if ((probe = ixj_probe_isa(&cnt)) < 0) {
return probe; return probe;
} }
if (pci_present()) {
if ((probe = ixj_probe_pci(&cnt)) < 0) { if ((probe = ixj_probe_pci(&cnt)) < 0) {
return probe; return probe;
} }
}
printk("%s\n", ixj_c_rcsid); printk("%s\n", ixj_c_rcsid);
create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL); create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL);
return probe; return probe;
......
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