patch-2.1.124 linux/arch/sparc/kernel/sun4c_irq.c

• Lines: 29
• Date: Sun Oct 4 10:22:42 1998
• Orig file: v2.1.123/linux/arch/sparc/kernel/sun4c_irq.c
• Orig date: Thu Aug 6 14:06:30 1998

diff -u --recursive --new-file v2.1.123/linux/arch/sparc/kernel/sun4c_irq.c linux/arch/sparc/kernel/sun4c_irq.c
@@ -121,7 +121,7 @@
 {
 	volatile unsigned int clear_intr;
 #ifdef CONFIG_SUN4
-	if( idprom->id_machtype == SM_SUN4 | SM_4_260 ) 
+	if (idprom->id_machtype == (SM_SUN4 | SM_4_260)) 
 	  clear_intr = sun4_timer.timer_limit10;
 	else
 #endif
@@ -146,7 +146,7 @@
 	 * the cache chip on the sun4c.
 	 */
 #ifdef CONFIG_SUN4
-	if (idprom->id_machtype == SM_SUN4 | SM_4_260)
+	if (idprom->id_machtype == (SM_SUN4 | SM_4_260))
 		sun4c_timers = &sun4_timer;
 	else
 #endif
@@ -171,7 +171,10 @@
 		prom_halt();
 	}
     
+#if 0
+	/* This does not work on 4/330 */
 	sun4c_enable_irq(10);
+#endif
 	claim_ticker14(NULL, PROFILE_IRQ, 0);
 }