summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-07-06 22:07:19 -0700
committerOlof Johansson <olof@lixom.net>2016-07-06 22:07:19 -0700
commit51a8506608054610e6d3ff739c5ff4adccc36276 (patch)
treeef1eb85812a3bd6b0f73b7a37c58192d3ff81f04
parent295e14b105b0f8fccf7d39d4dcc6cdc76893d70c (diff)
parenta1becf12c6dafd96d77e97c9a7cbc446ba1d1196 (diff)
downloadlinux-51a8506608054610e6d3ff739c5ff4adccc36276.tar.bz2
Merge tag 'renesas-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Renesas ARM Based SoC Defconfig Updates for v4.8 * Enable newly added support for r8a7792 SoC in multi_v7 and shmobile defconfigs * tag 'renesas-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC ARM: shmobile: defconfig: Enable r8a7792 SoC Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
-rw-r--r--arch/arm/configs/shmobile_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 9b7cf9634cbe..f6e7068525f5 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -91,6 +91,7 @@ CONFIG_ARCH_R8A7778=y
CONFIG_ARCH_R8A7779=y
CONFIG_ARCH_R8A7790=y
CONFIG_ARCH_R8A7791=y
+CONFIG_ARCH_R8A7792=y
CONFIG_ARCH_R8A7793=y
CONFIG_ARCH_R8A7794=y
CONFIG_ARCH_SH73A0=y
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index f2d635566a13..baa07a46a88b 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -17,6 +17,7 @@ CONFIG_ARCH_R8A7778=y
CONFIG_ARCH_R8A7779=y
CONFIG_ARCH_R8A7790=y
CONFIG_ARCH_R8A7791=y
+CONFIG_ARCH_R8A7792=y
CONFIG_ARCH_R8A7793=y
CONFIG_ARCH_R8A7794=y
CONFIG_ARCH_SH73A0=y