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/omap4_panda.h | |
| parent | c0cae2e24552d57f3e2f841ec235453413cd7389 (diff) | |
| parent | b1cde7e21f950e05d18c102976c3b7d232b65e13 (diff) | |
| download | blackbird-obmc-uboot-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.tar.gz blackbird-obmc-uboot-e97f9d817e600cd6f43d1d0da76f5787e33a5c56.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/omap4_panda.h')
| -rw-r--r-- | include/configs/omap4_panda.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 73dc088595..7378acdb21 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -4,7 +4,7 @@ * Steve Sakoman <steve@sakoman.com> * * Configuration settings for the TI OMAP4 Panda board. - * See omap4_common.h for OMAP4 common part + * See ti_omap4_common.h for OMAP4 common part * * SPDX-License-Identifier: GPL-2.0+ */ @@ -36,7 +36,7 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP -#include <configs/omap4_common.h> +#include <configs/ti_omap4_common.h> #define CONFIG_CMD_NET /* GPIO */ |
