diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-22 17:07:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-22 17:07:48 -0500 |
| commit | 0c9e85f67cd86d2d7a3424ea3ebff0e6db7a3915 (patch) | |
| tree | 1ac6999d2934173b7575540b310fda3147aaf67a /arch/arm/mach-uniphier/clk/dpll-sld8.c | |
| parent | afdf09ac260f7ec245c85b94a5de5f92af06bc25 (diff) | |
| parent | 2c2ab3d495a1a9fbfcec58f469255595a86e3aad (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Allow to disable SPL (mainly for ATF)
- Refactor SoC init code
- Update DRAM settings
- Add PXs3 SoC support (DT, pinctrl driver, SoC code)
Diffstat (limited to 'arch/arm/mach-uniphier/clk/dpll-sld8.c')
| -rw-r--r-- | arch/arm/mach-uniphier/clk/dpll-sld8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/clk/dpll-sld8.c b/arch/arm/mach-uniphier/clk/dpll-sld8.c index 7faa5e85b6..4a0010b5c7 100644 --- a/arch/arm/mach-uniphier/clk/dpll-sld8.c +++ b/arch/arm/mach-uniphier/clk/dpll-sld8.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> +#include <linux/delay.h> #include <linux/io.h> #include "../init.h" |