diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 20:45:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 20:45:32 +0200 |
| commit | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (patch) | |
| tree | ff58da14f35ec5596d2c3e82267394206f106a8c /include | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| parent | [MIPS] cpu-bugs64.c: GCC 3.3 constraint workaround (diff) | |
| download | linux-a88a8eff1e6e32d3288986a9d36c6a449c032d3a.tar.xz linux-a88a8eff1e6e32d3288986a9d36c6a449c032d3a.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] cpu-bugs64.c: GCC 3.3 constraint workaround
[MIPS] DEC: Initialise ioasic_ssr_lock
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/compiler.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-mips/compiler.h b/include/asm-mips/compiler.h index 169ae26105e9..aa6b876bbd78 100644 --- a/include/asm-mips/compiler.h +++ b/include/asm-mips/compiler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Maciej W. Rozycki + * Copyright (C) 2004, 2007 Maciej W. Rozycki * * 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 @@ -9,8 +9,10 @@ #define _ASM_COMPILER_H #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +#define GCC_IMM_ASM "n" #define GCC_REG_ACCUM "$0" #else +#define GCC_IMM_ASM "rn" #define GCC_REG_ACCUM "accum" #endif |