diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /arch/cris/arch-v32/kernel/kgdb_asm.S | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (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/cris/arch-v32/kernel/kgdb_asm.S')
| -rw-r--r-- | arch/cris/arch-v32/kernel/kgdb_asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/kgdb_asm.S b/arch/cris/arch-v32/kernel/kgdb_asm.S index 3e7fa9ef8510..eba93e7e4aad 100644 --- a/arch/cris/arch-v32/kernel/kgdb_asm.S +++ b/arch/cris/arch-v32/kernel/kgdb_asm.S | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * port exceptions for kernel debugging purposes. | 5 | * port exceptions for kernel debugging purposes. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <asm/arch/hwregs/intr_vect.h> | 8 | #include <arch/hwregs/intr_vect.h> |
| 9 | 9 | ||
| 10 | ;; Exported functions. | 10 | ;; Exported functions. |
| 11 | .globl kgdb_handle_exception | 11 | .globl kgdb_handle_exception |