diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 05:42:30 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 05:42:30 +0200 |
| commit | f45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch) | |
| tree | 773ae25f98542e6d382c688f7e85e8137d065614 /drivers/char/watchdog/ixp2000_wdt.c | |
| parent | Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 (diff) | |
| parent | Merge /spare/repo/linux-2.6/ (diff) | |
| download | linux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.tar.xz linux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.zip | |
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'drivers/char/watchdog/ixp2000_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/ixp2000_wdt.c | 7 |
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); } |