From a02b52dbea2edc6be159ee8bcb9a5dde25f23399 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 13 Sep 2008 22:08:26 -0700
Subject: [PATCH] --- yaml --- r: 113149 b: refs/heads/master c:
 b218fa0e9c2ad94b4e9ab5517a9210f9fa3745e2 h: refs/heads/master i:   113147:
 1292eacecf4d5d7a55224b706179020974818775 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc/kernel/sun4c_irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 710fa7b19de1..16467cadb22b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76954261ba907950cb5216e5c3075b5ba03c1a6b
+refs/heads/master: b218fa0e9c2ad94b4e9ab5517a9210f9fa3745e2
diff --git a/trunk/arch/sparc/kernel/sun4c_irq.c b/trunk/arch/sparc/kernel/sun4c_irq.c
index 6f28a13829ca..ae3149ecaecd 100644
--- a/trunk/arch/sparc/kernel/sun4c_irq.c
+++ b/trunk/arch/sparc/kernel/sun4c_irq.c
@@ -163,7 +163,7 @@ static void __init sun4c_init_timers(irq_handler_t counter_fn)
 		prom_halt();
 	}
     
-	claim_ticker14(NULL, PROFILE_IRQ, 0);
+	sun4c_disable_irq(PROFILE_IRQ);
 }
 
 #ifdef CONFIG_SMP