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-sh/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-sh/bug.h')
| -rw-r--r-- | include/asm-sh/bug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h index 70172217140f..70508a360cd6 100644 --- a/include/asm-sh/bug.h +++ b/include/asm-sh/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 | /* | 7 | /* |
| 7 | * Tell the user there is some problem. | 8 | * Tell the user there is some problem. |
| 8 | */ | 9 | */ |
| @@ -12,6 +13,8 @@ | |||
| 12 | } while (0) | 13 | } while (0) |
| 13 | 14 | ||
| 14 | #define HAVE_ARCH_BUG | 15 | #define HAVE_ARCH_BUG |
| 16 | #endif | ||
| 17 | |||
| 15 | #include <asm-generic/bug.h> | 18 | #include <asm-generic/bug.h> |
| 16 | 19 | ||
| 17 | #endif | 20 | #endif |