summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-20 16:57:17 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-20 16:57:17 +0100
commita507ef3ac68f0671fdd3f824885cd7f1ea1040b1 (patch)
tree943969bf51e7feb8fd362c551ea5446c458b6ec6 /arch/arm/mach-integrator
parent14eb75b6f83e3213d752dfe821df2fa57efbe519 (diff)
[PATCH] ARM: Remove nmi_tick() from Integrator.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator')
-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 d302f0405fd..bd1e5e3c9d3 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/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();