diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /include/asm-mips/system.h | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'include/asm-mips/system.h')
| -rw-r--r-- | include/asm-mips/system.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index dd5aa3422..c16163a32 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -1,10 +1,10 @@ -/* $Id: system.h,v 1.7 1998/05/04 03:53:22 ralf Exp $ +/* $Id: system.h,v 1.8 1998/07/20 17:52:21 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) 1994, 1995 by Ralf Baechle + * Copyright (C) 1994, 1995, 1996, 1997, 1998 by Ralf Baechle * Modified further for R[236]000 by Paul M. Antoine, 1996 */ #ifndef __ASM_MIPS_SYSTEM_H @@ -118,13 +118,13 @@ __asm__ __volatile__( \ : /* no input */ \ : "memory") -#if !defined (__LANGUAGE_ASSEMBLY__) +#if !defined (_LANGUAGE_ASSEMBLY) /* * switch_to(n) should switch tasks to task nr n, first * checking that n isn't the current task, in which case it does nothing. */ extern asmlinkage void (*resume)(void *tsk); -#endif /* !defined (__LANGUAGE_ASSEMBLY__) */ +#endif /* !defined (_LANGUAGE_ASSEMBLY) */ #define switch_to(prev,next) \ do { \ |