diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /include/asm-sh/bug.h | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-sh/bug.h')
| -rw-r--r-- | include/asm-sh/bug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h index 794c36daf06d..46f925c815ac 100644 --- a/include/asm-sh/bug.h +++ b/include/asm-sh/bug.h | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | #ifndef __ASM_SH_BUG_H | 1 | #ifndef __ASM_SH_BUG_H |
| 2 | #define __ASM_SH_BUG_H | 2 | #define __ASM_SH_BUG_H |
| 3 | 3 | ||
| 4 | #define TRAPA_BUG_OPCODE 0xc33e /* trapa #0x3e */ | ||
| 5 | |||
| 4 | #ifdef CONFIG_BUG | 6 | #ifdef CONFIG_BUG |
| 5 | #define HAVE_ARCH_BUG | 7 | #define HAVE_ARCH_BUG |
| 6 | #define HAVE_ARCH_WARN_ON | 8 | #define HAVE_ARCH_WARN_ON |
| 7 | 9 | ||
| 8 | #define TRAPA_BUG_OPCODE 0xc33e /* trapa #0x3e */ | ||
| 9 | |||
| 10 | /** | 10 | /** |
| 11 | * _EMIT_BUG_ENTRY | 11 | * _EMIT_BUG_ENTRY |
| 12 | * %1 - __FILE__ | 12 | * %1 - __FILE__ |