diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 14:49:01 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 14:49:01 +0000 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /arch/cris/arch-v10/kernel/traps.c | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
| download | linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'arch/cris/arch-v10/kernel/traps.c')
| -rw-r--r-- | arch/cris/arch-v10/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/traps.c b/arch/cris/arch-v10/kernel/traps.c index 9eada5d8893b..8bebb96bbca1 100644 --- a/arch/cris/arch-v10/kernel/traps.c +++ b/arch/cris/arch-v10/kernel/traps.c @@ -10,7 +10,7 @@ #include <linux/ptrace.h> #include <asm/uaccess.h> -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> void show_registers(struct pt_regs *regs) |