diff options
| author | Tom Rini <trini@ti.com> | 2013-07-12 10:36:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-12 10:36:48 -0400 |
| commit | fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc (patch) | |
| tree | 9c91526cefd027d9bd964572d4f92bd2d1376c5d /board/nvidia/common/board.c | |
| parent | d72da1582895ca226b995758426ec3769b54a9b8 (diff) | |
| parent | efc284e32503b240dbd35c6e8b8d098d702b4be7 (diff) | |
| download | olio-uboot-2014.01-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.tar.xz olio-uboot-2014.01-fbbbc86e8ebac4f42f4ca39ceba80cea27c983bc.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.
Conflicts:
arch/arm/dts/exynos5250.dtsi
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/nvidia/common/board.c')
| -rw-r--r-- | board/nvidia/common/board.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 8d7a22765..f60f21f39 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -47,6 +47,7 @@ #endif #ifdef CONFIG_USB_EHCI_TEGRA #include <asm/arch-tegra/usb.h> +#include <asm/arch/usb.h> #endif #ifdef CONFIG_TEGRA_MMC #include <asm/arch-tegra/tegra_mmc.h> |