---

yaml --- r: 16195 b: refs/heads/master c: 3adfd4e h: refs/heads/master i: 16193: 128e05a 16191: a68d7bc v: v3
git-mirror · Jan 5, 2006 · 57c06fc · 57c06fc
1 parent cd6482e
commit 57c06fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4da5cc2cec8caec1d357053e85a7a32f243f93a1
+refs/heads/master: 3adfd4e2b8804e926a5245062ba8ee12e88d30c3
diff --git a/trunk/drivers/char/watchdog/ixp4xx_wdt.c b/trunk/drivers/char/watchdog/ixp4xx_wdt.c
@@ -186,8 +186,8 @@ static int __init ixp4xx_wdt_init(void)
 	unsigned long processor_id;
 
 	asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :);
-	if (!(processor_id & 0xf)) {
-		printk("IXP4XXX Watchdog: Rev. A0 CPU detected - "
+	if (!(processor_id & 0xf) && !cpu_is_ixp46x()) {
+		printk("IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected - "
 			"watchdog disabled\n");
 
 		return -ENODEV;