diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 11:35:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 11:35:58 -0700 |
commit | 346fced899c7390e555cf90cd07d1e56b460d21b (patch) | |
tree | 4732fbdfc3bd40b5a2fd888bb741f42730e7c74d /drivers/char/watchdog/i8xx_tco.c | |
parent | 17af691cd19765b782d891fc50c1568d0f1276b3 (diff) | |
parent | 43a6b76050aa137c51d00eec91d67ac43ac3846e (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/char/watchdog/i8xx_tco.c')
-rw-r--r-- | drivers/char/watchdog/i8xx_tco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c index b14d642439e..5d07ee59679 100644 --- a/drivers/char/watchdog/i8xx_tco.c +++ b/drivers/char/watchdog/i8xx_tco.c @@ -401,7 +401,7 @@ static unsigned char __init i8xx_tco_getdevice (void) */ while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { - if (pci_match_device(i8xx_tco_pci_tbl, dev)) { + if (pci_match_id(i8xx_tco_pci_tbl, dev)) { i8xx_tco_pci = dev; break; } |