commit 20f720ccce8864583365d844d48d3fe8d0d171ad
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed Jun 29 18:26:19 2005 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Jun 29 18:26:19 2005 +0100
tree 093f9b4d2a1c366dc086a4d68f7ae3653c58775f
parent c7e788766610bdc764d7150e69ace2e0c4196cf0

[PATCH] ARM: Remove nmi_tick from integrator platforms

The nmi watchdog code hasn't been merged for this platform yet.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-integrator/core.c

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 797c7fd..dacbf50 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -215,7 +215,6 @@
 	 * primary CPU
 	 */
 	if (hard_smp_processor_id() == 0) {
-		nmi_tick();
 		timer_tick(regs);
 #ifdef CONFIG_SMP
 		smp_send_timer();