patch-2_6_7-vs1_9_1_12

[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 4020ab0..6f0657b 100644 (file)
--- a/drivers/char/watchdog/scx200_wdt.c
+++ b/drivers/char/watchdog/scx200_wdt.c
@@ -25,6 +25,7 @@
 #include <linux/watchdog.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
+#include <linux/fs.h>
 #include <linux/pci.h>
 #include <linux/scx200.h>
 
@@ -220,10 +221,16 @@ static int __init scx200_wdt_init(void)
 
        printk(KERN_DEBUG NAME ": NatSemi SCx200 Watchdog Driver\n");
 
-       /* First check that this really is a NatSemi SCx200 CPU */
+       /*
+        * First check that this really is a NatSemi SCx200 CPU or a Geode
+        * SC1100 processor
+        */
        if ((pci_find_device(PCI_VENDOR_ID_NS,
                             PCI_DEVICE_ID_NS_SCx200_BRIDGE,
-                            NULL)) == NULL)
+                            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 */