diff options
author | Tony Luck <tony.luck@intel.com> | 2005-05-18 00:53:14 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-05-18 00:53:14 +0200 |
commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /include/asm-m68k/bug.h | |
parent | [IA64] Merge audit fix for fsyscalls with syscall-optimizations (diff) | |
parent | [IA64] Fix convert_to_non_syscall() so gdb inferior calls work again (diff) | |
download | linux-325a479c4c110db278ef3361460a48c4093252cc.tar.xz linux-325a479c4c110db278ef3361460a48c4093252cc.zip |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'include/asm-m68k/bug.h')
-rw-r--r-- | include/asm-m68k/bug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-m68k/bug.h b/include/asm-m68k/bug.h index 3e1d2266fa69..072ce274d537 100644 --- a/include/asm-m68k/bug.h +++ b/include/asm-m68k/bug.h @@ -3,6 +3,7 @@ #include <linux/config.h> +#ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE #ifndef CONFIG_SUN3 #define BUG() do { \ @@ -22,6 +23,8 @@ #endif #define HAVE_ARCH_BUG +#endif + #include <asm-generic/bug.h> #endif |