/spare/repo/netdev-2.6 branch 'master'

1 files changed, 7 insertions, 13 deletions

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index daa2fb93052c..c9b69167632a 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -782,8 +782,14 @@ static void distribute_irqs(void)
 }
 #endif
 
+struct sun5_timer {
+        u64     count0;
+        u64     limit0;
+        u64     count1;
+        u64     limit1;
+};
 
-struct sun5_timer *prom_timers;
+static struct sun5_timer *prom_timers;
 static u64 prom_limit0, prom_limit1;
 
 static void map_prom_timers(void)
@@ -839,18 +845,6 @@ static void kill_prom_timer(void)
         : "g1", "g2");
 }
 
-void enable_prom_timer(void)
-{
-        if (!prom_timers)
-                return;
-
-        /* Set it to whatever was there before. */
-        prom_timers->limit1 = prom_limit1;
-        prom_timers->count1 = 0;
-        prom_timers->limit0 = prom_limit0;
-        prom_timers->count0 = 0;
-}
-
 void init_irqwork_curcpu(void)
 {
         register struct irq_work_struct *workp asm("o2");