summaryrefslogtreecommitdiffstats
path: root/arch/sh/lib64/panic.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
commita12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch)
tree957c915298b299902aa80afa7c78e94c71b3dc25 /arch/sh/lib64/panic.c
parentx86: fix setup code crashes on my old 486 box (diff)
parentLinux 2.6.27-rc3 (diff)
downloadlinux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz
linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/sh/lib64/panic.c')
-rw-r--r--arch/sh/lib64/panic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/lib64/panic.c b/arch/sh/lib64/panic.c
index ff559e2a96f7..da32ba7b5fcc 100644
--- a/arch/sh/lib64/panic.c
+++ b/arch/sh/lib64/panic.c
@@ -8,7 +8,7 @@
#include <linux/kernel.h>
#include <asm/io.h>
-#include <asm/cpu/registers.h>
+#include <cpu/registers.h>
/* THIS IS A PHYSICAL ADDRESS */
#define HDSP2534_ADDR (0x04002100)