diff options
author | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-07-28 14:54:29 -0400 |
commit | d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca (patch) | |
tree | 1df8ab92fd228598d5884db37cceddcb18a0c020 /arch/powerpc/cpu/mpc83xx/fdt.c | |
parent | ee860c60d2c5283c009f7ea740c6ee706da87cb7 (diff) | |
parent | fb5368789a45ca5ee4396cbbf563a8f16ab24f9c (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx/fdt.c')
-rw-r--r-- | arch/powerpc/cpu/mpc83xx/fdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index 450a9704e5..f249a585ed 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; #if defined(CONFIG_BOOTCOUNT_LIMIT) && \ (defined(CONFIG_QE) && !defined(CONFIG_MPC831x)) -#include <asm/immap_qe.h> +#include <linux/immap_qe.h> void fdt_fixup_muram (void *blob) { |