diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/watchdog/ixp4xx_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c index b5be8b11104a..3800835ca8f3 100644 --- a/drivers/char/watchdog/ixp4xx_wdt.c +++ b/drivers/char/watchdog/ixp4xx_wdt.c | |||
@@ -186,8 +186,8 @@ static int __init ixp4xx_wdt_init(void) | |||
186 | unsigned long processor_id; | 186 | unsigned long processor_id; |
187 | 187 | ||
188 | asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :); | 188 | asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :); |
189 | if (!(processor_id & 0xf)) { | 189 | if (!(processor_id & 0xf) && !cpu_is_ixp46x()) { |
190 | printk("IXP4XXX Watchdog: Rev. A0 CPU detected - " | 190 | printk("IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected - " |
191 | "watchdog disabled\n"); | 191 | "watchdog disabled\n"); |
192 | 192 | ||
193 | return -ENODEV; | 193 | return -ENODEV; |