Module Name:    src
Committed By:   skrll
Date:           Thu Nov  8 08:19:50 UTC 2012

Modified Files:
        src/sys/arch/evbarm/include: intr.h

Log Message:
unifdef __OLD_INTERRUPT_CODE


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/include/intr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/include/intr.h
diff -u src/sys/arch/evbarm/include/intr.h:1.23 src/sys/arch/evbarm/include/intr.h:1.24
--- src/sys/arch/evbarm/include/intr.h:1.23	Sun Jun 10 13:15:24 2012
+++ src/sys/arch/evbarm/include/intr.h	Thu Nov  8 08:19:50 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.23 2012/06/10 13:15:24 skrll Exp $	*/
+/*	$NetBSD: intr.h,v 1.24 2012/11/08 08:19:50 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -65,23 +65,6 @@
 #define IST_EDGE_BOTH	6
 #define IST_SOFT	7
 
-#ifdef __OLD_INTERRUPT_CODE	/* XXX XXX XXX */
-
-/* Software interrupt priority levels */
-
-#ifdef __HAVE_FAST_SOFTINTS
-#define SOFTIRQ_CLOCK   0
-#define SOFTIRQ_BIO     1
-#define SOFTIRQ_NET     2
-#define SOFTIRQ_SERIAL  3
-
-#define SOFTIRQ_BIT(x)  (1 << x)
-#endif
-
-#include <arm/arm32/psl.h>
-
-#else /* ! __OLD_INTERRUPT_CODE */
-
 #ifndef _LOCORE
 
 #include <sys/queue.h>
@@ -167,8 +150,6 @@ splraiseipl(ipl_cookie_t icookie)
 
 #endif /* ! _LOCORE */
 
-#endif /* __OLD_INTERRUPT_CODE */
-
 #endif /* _KERNEL */
 
 #endif	/* _EVBARM_INTR_H_ */

Reply via email to