diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /arch/mn10300/include/asm/gdb-stub.h | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/mn10300/include/asm/gdb-stub.h')
| -rw-r--r-- | arch/mn10300/include/asm/gdb-stub.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/gdb-stub.h b/arch/mn10300/include/asm/gdb-stub.h index e5a6368559af..556cce992548 100644 --- a/arch/mn10300/include/asm/gdb-stub.h +++ b/arch/mn10300/include/asm/gdb-stub.h | |||
| @@ -109,7 +109,6 @@ extern asmlinkage int gdbstub_intercept(struct pt_regs *, enum exception_code); | |||
| 109 | extern asmlinkage void gdbstub_exception(struct pt_regs *, enum exception_code); | 109 | extern asmlinkage void gdbstub_exception(struct pt_regs *, enum exception_code); |
| 110 | extern asmlinkage void __gdbstub_bug_trap(void); | 110 | extern asmlinkage void __gdbstub_bug_trap(void); |
| 111 | extern asmlinkage void __gdbstub_pause(void); | 111 | extern asmlinkage void __gdbstub_pause(void); |
| 112 | extern asmlinkage void start_kernel(void); | ||
| 113 | 112 | ||
| 114 | #ifndef CONFIG_MN10300_CACHE_DISABLED | 113 | #ifndef CONFIG_MN10300_CACHE_DISABLED |
| 115 | extern asmlinkage void gdbstub_purge_cache(void); | 114 | extern asmlinkage void gdbstub_purge_cache(void); |