diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
commit | d6694aff569a0838a9d0ef352128f5aa309d73ff (patch) | |
tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /arch/arm/cpu/arm720t | |
parent | b5b8d85e9a50c2294b6043830cd045de1002dc5d (diff) | |
parent | 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff) | |
download | u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.gz u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.xz u-boot-d6694aff569a0838a9d0ef352128f5aa309d73ff.zip |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/arm720t')
-rw-r--r-- | arch/arm/cpu/arm720t/tegra-common/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm720t/tegra-common/spl.c b/arch/arm/cpu/arm720t/tegra-common/spl.c index 3479541020..e0f9d5b6b4 100644 --- a/arch/arm/cpu/arm720t/tegra-common/spl.c +++ b/arch/arm/cpu/arm720t/tegra-common/spl.c @@ -15,7 +15,7 @@ #include <asm/arch/tegra.h> #include <asm/arch-tegra/apb_misc.h> #include <asm/arch-tegra/board.h> -#include <asm/arch/spl.h> +#include <asm/spl.h> #include "cpu.h" void spl_board_init(void) |