diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /include/asm-arm/bug.h | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'include/asm-arm/bug.h')
| -rw-r--r-- | include/asm-arm/bug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h index 5e91b90a8181..24d11672eb60 100644 --- a/include/asm-arm/bug.h +++ b/include/asm-arm/bug.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/config.h> | 4 | #include <linux/config.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_BUG | ||
| 6 | #ifdef CONFIG_DEBUG_BUGVERBOSE | 7 | #ifdef CONFIG_DEBUG_BUGVERBOSE |
| 7 | extern volatile void __bug(const char *file, int line, void *data); | 8 | extern volatile void __bug(const char *file, int line, void *data); |
| 8 | 9 | ||
| @@ -17,6 +18,8 @@ extern volatile void __bug(const char *file, int line, void *data); | |||
| 17 | #endif | 18 | #endif |
| 18 | 19 | ||
| 19 | #define HAVE_ARCH_BUG | 20 | #define HAVE_ARCH_BUG |
| 21 | #endif | ||
| 22 | |||
| 20 | #include <asm-generic/bug.h> | 23 | #include <asm-generic/bug.h> |
| 21 | 24 | ||
| 22 | #endif | 25 | #endif |