diff options
| author | Tom Rini <trini@ti.com> | 2014-04-25 14:57:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-04-25 14:57:58 -0400 |
| commit | b71bf4add68a4a532196c0bead99ed1753014c2a (patch) | |
| tree | 9500272d50c1434e22a5319dc71b4328bc6ad7e0 /arch/powerpc/cpu/mpc83xx/cpu.c | |
| parent | 080d897585428d0fd42c237abfb6746908f4effc (diff) | |
| parent | eaf8c986d36e9fadd244093b17a7fe090b0b572a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx/cpu.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index e275fcea41..e41988d5fa 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -19,7 +19,7 @@ #include <tsec.h> #include <netdev.h> #include <fsl_esdhc.h> -#ifdef CONFIG_BOOTCOUNT_LIMIT +#if defined(CONFIG_BOOTCOUNT_LIMIT) && !defined(CONFIG_MPC831x) #include <asm/immap_qe.h> #include <asm/io.h> #endif |