diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 09:14:09 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 09:14:09 +0200 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /include/asm-sparc64/bug.h | |
| parent | [AUDIT] Update UML audit-syscall-{entry,exit} calls to new prototypes (diff) | |
| parent | [PATCH] JFS: Don't allocate extents that overlap existing extents (diff) | |
| download | linux-27b030d58c8e72fc7a95187a791bd9406e350f02.tar.xz linux-27b030d58c8e72fc7a95187a791bd9406e350f02.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-sparc64/bug.h')
| -rw-r--r-- | include/asm-sparc64/bug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-sparc64/bug.h b/include/asm-sparc64/bug.h index 25c5b1dfe378..516bb27f3fc4 100644 --- a/include/asm-sparc64/bug.h +++ b/include/asm-sparc64/bug.h @@ -1,6 +1,7 @@ #ifndef _SPARC64_BUG_H #define _SPARC64_BUG_H +#ifdef CONFIG_BUG #include <linux/compiler.h> #ifdef CONFIG_DEBUG_BUGVERBOSE @@ -14,6 +15,8 @@ extern void do_BUG(const char *file, int line); #endif #define HAVE_ARCH_BUG +#endif + #include <asm-generic/bug.h> #endif |