Merge branches 'release', 'idle', 'redhat-bugzilla-436589', 'sbs' and 'video' into...

[sfrench/cifs-2.6.git] / arch / sparc64 / kernel / ttable.S

diff --git a/arch/sparc64/kernel/ttable.S b/arch/sparc64/kernel/ttable.S
index ee45ca2d7a04da5b8fb6a4cd21c1c0413f4e4a46..7575aa371da823b8234a50102986b76c57fddee6 100644 (file)
--- a/arch/sparc64/kernel/ttable.S
+++ b/arch/sparc64/kernel/ttable.S
@@ -3,7 +3,6 @@
  * Copyright (C) 1996, 2001, 2006 David S. Miller (davem@davemloft.net)
  */
 
-#include <linux/config.h>
 
        .globl  sparc64_ttable_tl0, sparc64_ttable_tl1
        .globl  tl0_icpe, tl1_icpe
@@ -61,11 +60,7 @@ tl0_irq4:    BTRAP(0x44)
 tl0_irq5:      TRAP_IRQ(handler_irq, 5)
 tl0_irq6:      BTRAP(0x46) BTRAP(0x47) BTRAP(0x48) BTRAP(0x49)
 tl0_irq10:     BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d)
-#ifndef CONFIG_SMP
-tl0_irq14:     TRAP_IRQ(timer_irq, 14)
-#else
-tl0_irq14:     TICK_SMP_IRQ
-#endif
+tl0_irq14:     TRAP_IRQ(timer_interrupt, 14)
 tl0_irq15:     TRAP_IRQ(handler_irq, 15)
 tl0_resv050:   BTRAP(0x50) BTRAP(0x51) BTRAP(0x52) BTRAP(0x53) BTRAP(0x54) BTRAP(0x55)
 tl0_resv056:   BTRAP(0x56) BTRAP(0x57) BTRAP(0x58) BTRAP(0x59) BTRAP(0x5a) BTRAP(0x5b)