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/moxa.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/moxa.c')
-rw-r--r-- | drivers/char/moxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 7c24fbe831f..95f7046ff05 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -451,7 +451,7 @@ static int __init moxa_init(void) int n = (sizeof(moxa_pcibrds) / sizeof(moxa_pcibrds[0])) - 1; i = 0; while (i < n) { - while ((p = pci_find_device(moxa_pcibrds[i].vendor, moxa_pcibrds[i].device, p))!=NULL) + while ((p = pci_get_device(moxa_pcibrds[i].vendor, moxa_pcibrds[i].device, p))!=NULL) { if (pci_enable_device(p)) continue; |