From 57c06fc2f3b66731520fdde8b68c56aadaef5df1 Mon Sep 17 00:00:00 2001
From: Deepak Saxena <dsaxena@plexity.net>
Date: Tue, 3 Jan 2006 12:50:30 -0800
Subject: [PATCH] --- yaml --- r: 16195 b: refs/heads/master c:
 3adfd4e2b8804e926a5245062ba8ee12e88d30c3 h: refs/heads/master i:   16193:
 128e05ad15d72d624018d10ef477dcbbedac13d2   16191:
 a68d7bcf665f1ad0b0bea7caaa8d282b8388dcd0 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/char/watchdog/ixp4xx_wdt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1c49755aadf1..085d11942180 100644
--- 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
index b5be8b11104a..3800835ca8f3 100644
--- 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;