summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/softirq.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
commit1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch)
tree357efc7b93f8f5102110d20d293f41360ec212fc /include/asm-mips/softirq.h
parentaea27b2e18d69af87e673972246e66657b4fa274 (diff)
Merge with Linux 2.3.21.
Diffstat (limited to 'include/asm-mips/softirq.h')
-rw-r--r--include/asm-mips/softirq.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-mips/softirq.h b/include/asm-mips/softirq.h
index f225e87ba..a7e7a074a 100644
--- a/include/asm-mips/softirq.h
+++ b/include/asm-mips/softirq.h
@@ -1,13 +1,14 @@
-/* $Id: softirq.h,v 1.8 1999/08/13 17:07:27 harald Exp $
+/* $Id: softirq.h,v 1.9 1999/11/19 20:35:48 ralf Exp $
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 1997, 1998, 1999 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
*/
-#ifndef __ASM_MIPS_SOFTIRQ_H
-#define __ASM_MIPS_SOFTIRQ_H
+#ifndef _ASM_SOFTIRQ_H
+#define _ASM_SOFTIRQ_H
#include <linux/config.h>
@@ -106,4 +107,4 @@ extern inline void end_bh_atomic(void)
#define softirq_endlock(cpu) (cpu_bh_endlock(cpu))
#define synchronize_bh() barrier()
-#endif /* __ASM_MIPS_SOFTIRQ_H */
+#endif /* _ASM_SOFTIRQ_H */