diff options
author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /arch/m68k/include/asm/dbg.h | |
parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/m68k/include/asm/dbg.h')
-rw-r--r-- | arch/m68k/include/asm/dbg.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/dbg.h b/arch/m68k/include/asm/dbg.h new file mode 100644 index 000000000000..27af3270f671 --- /dev/null +++ b/arch/m68k/include/asm/dbg.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #define DEBUG 1 | ||
2 | #ifdef CONFIG_COLDFIRE | ||
3 | #define BREAK asm volatile ("halt") | ||
4 | #else | ||
5 | #define BREAK *(volatile unsigned char *)0xdeadbee0 = 0 | ||
6 | #endif | ||