diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-19 14:49:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-19 15:13:38 -0400 |
| commit | 02ccab1908c405fe1449457d4a0d343784a30acb (patch) | |
| tree | 3a5d41abff96a3af22587ace67713d5c0165b097 /include/configs/colibri_vf.h | |
| parent | f40574e2d78c96a3818c4fa2379382d924866a6e (diff) | |
| parent | d883fcc6bbb2fcc3df90857fee99c2f543a0289c (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/bk4r1_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/colibri_vf.h
include/configs/pcm052.h
Diffstat (limited to 'include/configs/colibri_vf.h')
| -rw-r--r-- | include/configs/colibri_vf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 35f259cd00..888899eacb 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -14,7 +14,6 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_VF610 #define CONFIG_SYS_FSL_CLK #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ |