Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index ab659d37b4d2..4e98c215e5b1 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -192,7 +192,12 @@ static struct miscdevice ixp2000_wdt_miscdev =
 
 static int __init ixp2000_wdt_init(void)
 {
-        wdt_tick_rate = (*IXP2000_T1_CLD * HZ)/ 256;;
+        if ((*IXP2000_PRODUCT_ID & 0x001ffef0) == 0x00000000) {
+                printk(KERN_INFO "Unable to use IXP2000 watchdog due to IXP2800 erratum #25.\n");
+                return -EIO;
+        }
+
+        wdt_tick_rate = (*IXP2000_T1_CLD * HZ) / 256;
 
         return misc_register(&ixp2000_wdt_miscdev);
 }