diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 14:59:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 14:59:07 -0700 |
| commit | adb2705a89e8b41abcf29c0ed86f4ce93ab36734 (patch) | |
| tree | 01d772570d58cce24b61874e711fd9f51e2729e7 /drivers/char/rio/rio_linux.c | |
| parent | f340c0d1a3f40fdcba69cd291530a4debc58748f (diff) | |
| parent | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/char/rio/rio_linux.c')
| -rw-r--r-- | drivers/char/rio/rio_linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index 7db3370f497..d7d484024e2 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c @@ -1095,7 +1095,7 @@ static int __init rio_init(void) #ifdef CONFIG_PCI /* First look for the JET devices: */ - while ((pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX, + while ((pdev = pci_get_device (PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, pdev))) { if (pci_enable_device(pdev)) continue; @@ -1169,7 +1169,7 @@ static int __init rio_init(void) */ /* Then look for the older RIO/PCI devices: */ - while ((pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX, + while ((pdev = pci_get_device (PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_RIO, pdev))) { if (pci_enable_device(pdev)) continue; |