summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/irq.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /include/asm-sparc/irq.h
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'include/asm-sparc/irq.h')
-rw-r--r--include/asm-sparc/irq.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h
index 38e861eb6..05c3374fa 100644
--- a/include/asm-sparc/irq.h
+++ b/include/asm-sparc/irq.h
@@ -1,4 +1,4 @@
-/* $Id: irq.h,v 1.26 1999/04/20 13:22:44 anton Exp $
+/* $Id: irq.h,v 1.27 1999/08/14 03:52:02 anton Exp $
* irq.h: IRQ registers on the Sparc.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -8,7 +8,7 @@
#define _SPARC_IRQ_H
#include <linux/linkage.h>
-#include <linux/tasks.h> /* For NR_CPUS */
+#include <linux/threads.h> /* For NR_CPUS */
#include <asm/system.h> /* For SUN4M_NCPUS */
#include <asm/btfixup.h>