diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-29 14:07:50 +0100 |
| commit | e97f9d817e600cd6f43d1d0da76f5787e33a5c56 (patch) | |
| tree | 99603834683039fec18a31770f8a05879d432e6d /include/configs/dra7xx_evm.h | |
| parent | c0cae2e24552d57f3e2f841ec235453413cd7389 (diff) | |
| parent | b1cde7e21f950e05d18c102976c3b7d232b65e13 (diff) | |
| download | u-boot-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.tar.gz | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/dra7xx_evm.h')
| -rw-r--r-- | include/configs/dra7xx_evm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index f210ed8b92..04ae3ca41d 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -4,7 +4,7 @@ * Lokesh Vutla <lokeshvutla@ti.com> * * Configuration settings for the TI DRA7XX board. - * See omap5_common.h for omap5 common settings. + * See ti_omap5_common.h for omap5 common settings. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -34,7 +34,7 @@ #define CONFIG_SYS_OMAP_ABE_SYSCK -#include <configs/omap5_common.h> +#include <configs/ti_omap5_common.h> /* CPSW Ethernet */ #define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ |