patch-2.4.20 linux-2.4.20/include/asm-mips/irq.h

Next file: linux-2.4.20/include/asm-mips/kmap_types.h
Previous file: linux-2.4.20/include/asm-mips/ipcbuf.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/include/asm-mips/irq.h linux-2.4.20/include/asm-mips/irq.h
@@ -4,16 +4,16 @@
  * for more details.
  *
  * Copyright (C) 1994 by Waldorf GMBH, written by Ralf Baechle
- * Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 by Ralf Baechle
+ * Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ * Copyright (C) 2001 Kanoj Sarcar
  */
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
 #include <linux/config.h>
 
-#define NR_IRQS 64		/* Largest number of ints of all machines.  */
-
-#define TIMER_IRQ 0
+#define NR_IRQS 128		/* Largest number of ints of all machines.  */
 
 #ifdef CONFIG_I8259
 static inline int irq_cannonicalize(int irq)
@@ -28,10 +28,10 @@
 extern int i8259_setup_irq(int irq, struct irqaction * new);
 extern void disable_irq(unsigned int);
 
-#ifndef CONFIG_NEW_IRQ
-#define disable_irq_nosync	disable_irq
-#else
+#ifdef CONFIG_NEW_IRQ
 extern void disable_irq_nosync(unsigned int);
+#else
+#define disable_irq_nosync	disable_irq
 #endif
 
 extern void enable_irq(unsigned int);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)