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 'u-boot-ti/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
imx-common
/
iomux-v3.c
diff --git
a/arch/arm/imx-common/iomux-v3.c
b/arch/arm/imx-common/iomux-v3.c
index 306183a70ec9159ecba00071334a436b866a1dcb..22cd11aa04867c47c8d7356683889324d8ad6a25 100644
(file)
--- a/
arch/arm/imx-common/iomux-v3.c
+++ b/
arch/arm/imx-common/iomux-v3.c
@@
-11,7
+11,9
@@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/imx-regs.h>
+#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610)
#include <asm/arch/sys_proto.h>
+#endif
#include <asm/imx-common/iomux-v3.h>
static void *base = (void *)IOMUXC_BASE_ADDR;