summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-29 18:26:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-06-29 18:26:19 +0100
commit20f720ccce8864583365d844d48d3fe8d0d171ad (patch)
tree093f9b4d2a1c366dc086a4d68f7ae3653c58775f /arch
parentc7e788766610bdc764d7150e69ace2e0c4196cf0 (diff)
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-integrator/core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 797c7fddaa0d..dacbf504dae2 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -215,7 +215,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();