diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /arch/sh/lib64 | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'arch/sh/lib64')
| -rw-r--r-- | arch/sh/lib64/panic.c | 2 |
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 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <asm/io.h> | 10 | #include <asm/io.h> |
| 11 | #include <asm/cpu/registers.h> | 11 | #include <cpu/registers.h> |
| 12 | 12 | ||
| 13 | /* THIS IS A PHYSICAL ADDRESS */ | 13 | /* THIS IS A PHYSICAL ADDRESS */ |
| 14 | #define HDSP2534_ADDR (0x04002100) | 14 | #define HDSP2534_ADDR (0x04002100) |