Update of /cvsroot/linux-apus/2.3/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv11606/include/linux
Modified Files:
irq.h
Log Message:
conflict fixes from import bitkeeper (2.4.6)
Index: irq.h
===================================================================
RCS file: /cvsroot/linux-apus/2.3/include/linux/irq.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- irq.h 2001/04/02 22:55:20 1.2
+++ irq.h 2001/07/08 16:59:56 1.3
@@ -62,7 +62,4 @@
extern hw_irq_controller no_irq_type; /* needed in every arch ? */
extern void no_action(int cpl, void *dev_id, struct pt_regs *regs);
-extern volatile unsigned long irq_err_count;
-
#endif /* __asm_h */
-
|
