projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
[oweals/u-boot.git]
/
arch
/
arm
/
mach-uniphier
/
memconf.c
diff --git
a/arch/arm/mach-uniphier/memconf.c
b/arch/arm/mach-uniphier/memconf.c
index 205ccf1c655d98af4e71a1f15c1e64b55b8ecce9..dcfc6455ba7c4b43c35680ff96c04ff49bae799f 100644
(file)
--- a/
arch/arm/mach-uniphier/memconf.c
+++ b/
arch/arm/mach-uniphier/memconf.c
@@
-7,7
+7,7
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <linux/err.h>
+#include <linux/err
no
.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <linux/io.h>
#include <linux/sizes.h>