[IA64-SGI] - New SN hardware support - no_wars

Disable some shub1-specific code when running on systems with shub2.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

arch/ia64/sn/kernel/sn2/timer_interrupt.c

 /*
  *
  *
- * Copyright (c) 2003 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2005 Silicon Graphics, Inc.  All Rights Reserved.
  * 
  * This program is free software; you can redistribute it and/or modify it 
  * under the terms of version 2 of the GNU General Public License 
@@ -50,6 +50,7 @@ void sn_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 			     LED_CPU_HEARTBEAT, LED_CPU_HEARTBEAT);
 	}
 
+	if (is_shub1()) {
 		if (enable_shub_wars_1_1()) {
 			/* Bugfix code for SHUB 1.1 */
 			if (pda->pio_shub_war_cam_addr)
@@ -60,4 +61,5 @@ void sn_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 		pda->sn_lb_int_war_ticks++;
 		if (pda->sn_lb_int_war_ticks >= SN_LB_INT_WAR_INTERVAL)
 			pda->sn_lb_int_war_ticks = 0;
+	}
 }