projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-block.git]
/
arch
/
arm
/
configs
/
multi_v7_defconfig
diff --git
a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index cd7b198fc79e220a1a082ada1889f919751a123f..b0df2574599a270ad24caad7b2cc4e66055c6e66 100644
(file)
--- a/
arch/arm/configs/multi_v7_defconfig
+++ b/
arch/arm/configs/multi_v7_defconfig
@@
-75,7
+75,7
@@
CONFIG_MACH_SPEAR1340=y
CONFIG_ARCH_STI=y
CONFIG_ARCH_EXYNOS=y
CONFIG_EXYNOS5420_MCPM=y
-CONFIG_ARCH_
SHMOBILE_MULTI
=y
+CONFIG_ARCH_
RENESAS
=y
CONFIG_ARCH_EMEV2=y
CONFIG_ARCH_R7S72100=y
CONFIG_ARCH_R8A73A4=y