diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-07 22:19:49 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-07 22:19:49 +0200 |
commit | f91506e28387fece392b5dd3bb3aa309e4ce7e4d (patch) | |
tree | 3e46227d94b7b379341fba534df5aa3dd3948f68 /arch/powerpc/cpu/mpc85xx/traps.c | |
parent | 5549d22b656550d36b2cc46743c7220ab0e9dcc4 (diff) | |
parent | 2df0e6fc6b71448e1752e4ce1d5577d8977f3e5e (diff) |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/traps.c')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index 7e96664333b..78007177a1d 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -288,7 +288,7 @@ UnknownException(struct pt_regs *regs) void ExtIntException(struct pt_regs *regs) { - volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR); + volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC8xxx_PIC_ADDR); uint vect; |