projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'xnext/zynqmp' of git://www.denx.de/git/u-boot-microblaze
[platform/kernel/u-boot.git]
/
arch
/
arm
/
Kconfig
diff --git
a/arch/arm/Kconfig
b/arch/arm/Kconfig
index
5e255cb
..
bc55e5b
100644
(file)
--- a/
arch/arm/Kconfig
+++ b/
arch/arm/Kconfig
@@
-727,7
+727,7
@@
source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
source "arch/arm/mach-tegra/Kconfig"
-source "arch/arm/
cpu/armv7/
uniphier/Kconfig"
+source "arch/arm/
mach-
uniphier/Kconfig"
source "arch/arm/mach-versatile/Kconfig"