diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-sparc/bug.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-sparc/bug.h')
| -rw-r--r-- | include/asm-sparc/bug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-sparc/bug.h b/include/asm-sparc/bug.h index 0d30a67d87a3..04151208189f 100644 --- a/include/asm-sparc/bug.h +++ b/include/asm-sparc/bug.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef _SPARC_BUG_H | 1 | #ifndef _SPARC_BUG_H |
| 2 | #define _SPARC_BUG_H | 2 | #define _SPARC_BUG_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_BUG | ||
| 4 | /* Only use the inline asm until a gcc release that can handle __builtin_trap | 5 | /* Only use the inline asm until a gcc release that can handle __builtin_trap |
| 5 | * -rob 2003-06-25 | 6 | * -rob 2003-06-25 |
| 6 | * | 7 | * |
| @@ -26,6 +27,8 @@ extern void do_BUG(const char *file, int line); | |||
| 26 | #endif | 27 | #endif |
| 27 | 28 | ||
| 28 | #define HAVE_ARCH_BUG | 29 | #define HAVE_ARCH_BUG |
| 30 | #endif | ||
| 31 | |||
| 29 | #include <asm-generic/bug.h> | 32 | #include <asm-generic/bug.h> |
| 30 | 33 | ||
| 31 | #endif | 34 | #endif |