diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /arch/m32r/kernel/process.c | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'arch/m32r/kernel/process.c')
| -rw-r--r-- | arch/m32r/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 44cbe0ce0f8f..a689e2978b6e 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
| @@ -174,7 +174,7 @@ void show_regs(struct pt_regs * regs) | |||
| 174 | regs->acc1h, regs->acc1l); | 174 | regs->acc1h, regs->acc1l); |
| 175 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) | 175 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) |
| 176 | printk("ACCH[%08lx]:ACCL[%08lx]\n", \ | 176 | printk("ACCH[%08lx]:ACCL[%08lx]\n", \ |
| 177 | regs->acch, regs->accl); | 177 | regs->acc0h, regs->acc0l); |
| 178 | #else | 178 | #else |
| 179 | #error unknown isa configuration | 179 | #error unknown isa configuration |
| 180 | #endif | 180 | #endif |