summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier/dram/umc-sld8.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-01-22 17:07:48 -0500
committerTom Rini <trini@konsulko.com>2017-01-22 17:07:48 -0500
commit0c9e85f67cd86d2d7a3424ea3ebff0e6db7a3915 (patch)
tree1ac6999d2934173b7575540b310fda3147aaf67a /arch/arm/mach-uniphier/dram/umc-sld8.c
parentafdf09ac260f7ec245c85b94a5de5f92af06bc25 (diff)
parent2c2ab3d495a1a9fbfcec58f469255595a86e3aad (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/dram/umc-sld8.c')
-rw-r--r--arch/arm/mach-uniphier/dram/umc-sld8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index 61369f1ed1..a0c28715b6 100644
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -7,7 +7,7 @@
*/
#include <common.h>
-#include <linux/err.h>
+#include <linux/errno.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <asm/processor.h>