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/interrupts.c | |
| parent | 5549d22b656550d36b2cc46743c7220ab0e9dcc4 (diff) | |
| parent | 2df0e6fc6b71448e1752e4ce1d5577d8977f3e5e (diff) | |
| download | u-boot-imx-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.zip u-boot-imx-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.tar.gz u-boot-imx-f91506e28387fece392b5dd3bb3aa309e4ce7e4d.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/interrupts.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/interrupts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c index ac8c01a..a62b031 100644 --- a/arch/powerpc/cpu/mpc85xx/interrupts.c +++ b/arch/powerpc/cpu/mpc85xx/interrupts.c @@ -35,7 +35,7 @@ int interrupt_init_cpu(unsigned int *decrementer_count) { - ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC85xx_PIC_ADDR; + ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR; out_be32(&pic->gcr, MPC85xx_PICGCR_RST); while (in_be32(&pic->gcr) & MPC85xx_PICGCR_RST) |