git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
scx200_wdt.c
diff --git
a/drivers/char/watchdog/scx200_wdt.c
b/drivers/char/watchdog/scx200_wdt.c
index
0c47a43
..
983e9e9
100644
(file)
--- a/
drivers/char/watchdog/scx200_wdt.c
+++ b/
drivers/char/watchdog/scx200_wdt.c
@@
-217,11
+217,6
@@
static struct miscdevice scx200_wdt_miscdev = {
static int __init scx200_wdt_init(void)
{
int r;
static int __init scx200_wdt_init(void)
{
int r;
- static struct pci_device_id ns_sc[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
- { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
- { },
- };
printk(KERN_DEBUG NAME ": NatSemi SCx200 Watchdog Driver\n");
printk(KERN_DEBUG NAME ": NatSemi SCx200 Watchdog Driver\n");
@@
-229,7
+224,12
@@
static int __init scx200_wdt_init(void)
* First check that this really is a NatSemi SCx200 CPU or a Geode
* SC1100 processor
*/
* First check that this really is a NatSemi SCx200 CPU or a Geode
* SC1100 processor
*/
- if (!pci_dev_present(ns_sc))
+ if ((pci_find_device(PCI_VENDOR_ID_NS,
+ PCI_DEVICE_ID_NS_SCx200_BRIDGE,
+ NULL)) == NULL
+ && (pci_find_device(PCI_VENDOR_ID_NS,
+ PCI_DEVICE_ID_NS_SC1100_BRIDGE,
+ NULL)) == NULL)
return -ENODEV;
/* More sanity checks, verify that the configuration block is there */
return -ENODEV;
/* More sanity checks, verify that the configuration block is there */