From 27b4ff1a44e0b77f739aa28cd24f58a64080c53d Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 20 Jun 2005 16:57:17 +0100
Subject: [PATCH] --- yaml --- r: 2298 b: refs/heads/master c:
 a507ef3ac68f0671fdd3f824885cd7f1ea1040b1 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-integrator/core.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef4ef14f32df..2873a2cee39b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14eb75b6f83e3213d752dfe821df2fa57efbe519
+refs/heads/master: a507ef3ac68f0671fdd3f824885cd7f1ea1040b1
diff --git a/trunk/arch/arm/mach-integrator/core.c b/trunk/arch/arm/mach-integrator/core.c
index d302f0405fd2..bd1e5e3c9d34 100644
--- a/trunk/arch/arm/mach-integrator/core.c
+++ b/trunk/arch/arm/mach-integrator/core.c
@@ -227,7 +227,6 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	 * primary CPU
 	 */
 	if (hard_smp_processor_id() == 0) {
-		nmi_tick();
 		timer_tick(regs);
 #ifdef CONFIG_SMP
 		smp_send_timer();