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-video
[oweals/u-boot.git]
/
arch
/
arm
/
mach-uniphier
/
init
/
init-ph1-pro5.c
diff --git
a/arch/arm/mach-uniphier/init/init-ph1-pro5.c
b/arch/arm/mach-uniphier/init/init-ph1-pro5.c
index 92b3f21d93c2c46b0a8630e3b74f83c121e30051..45c65cf49a7495da0e745d0ed238a619459484bf 100644
(file)
--- a/
arch/arm/mach-uniphier/init/init-ph1-pro5.c
+++ b/
arch/arm/mach-uniphier/init/init-ph1-pro5.c
@@
-6,9
+6,9
@@
#include <common.h>
#include <spl.h>
-#include <linux/compiler.h>
-#include
<mach/init.h>
-#include
<mach/micro-support-card.h>
+
+#include
"../init.h"
+#include
"../micro-support-card.h"
int ph1_pro5_init(const struct uniphier_board_data *bd)
{