From: Olof Johansson <olof@lixom.net>
Date: Thu, 26 Jul 2018 06:59:13 +0000 (-0700)
Subject: Merge tag 'renesas-arm-defconfig-for-v4.19' of https://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8b0c9a98104fe207be4496fedd4e8815800faa6c;p=linux.git

Merge tag 'renesas-arm-defconfig-for-v4.19' of https://git./linux/kernel/git/horms/renesas into next/defconfig

Renesas ARM Based SoC Defconfig Updates for v4.19

 - Enable new RZN1D-DB board in multi_v7_defconfig and shmobile_defconfig

 - shmobile_defconfig:
   + Drop NET_VENDOR_<FOO>=n
   + Disable long deprecated /sbin/hotplug helper
   + Enable reset controller support

* tag 'renesas-arm-defconfig-for-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: multi_v7_defconfig: Enable support for RZN1D-DB
  ARM: shmobile: defconfig: Disable /sbin/hotplug fork-bomb
  ARM: shmobile: defconfig: Enable support for RZN1D-DB
  ARM: shmobile: defconfig: Enable reset controller support
  ARM: shmobile: defconfig: Drop NET_VENDOR_<FOO>=n

Signed-off-by: Olof Johansson <olof@lixom.net>
---

8b0c9a98104fe207be4496fedd4e8815800faa6c
diff --cc arch/arm/configs/multi_v7_defconfig
index 0626b67159842,874813d7c08e5..f5c5cf79bf7dc
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -88,18 -98,19 +88,19 @@@ CONFIG_ARCH_R8A7791=
  CONFIG_ARCH_R8A7792=y
  CONFIG_ARCH_R8A7793=y
  CONFIG_ARCH_R8A7794=y
+ CONFIG_ARCH_R9A06G032=y
  CONFIG_ARCH_SH73A0=y
 +CONFIG_ARCH_SOCFPGA=y
 +CONFIG_PLAT_SPEAR=y
 +CONFIG_ARCH_SPEAR13XX=y
 +CONFIG_MACH_SPEAR1310=y
 +CONFIG_MACH_SPEAR1340=y
 +CONFIG_ARCH_STI=y
 +CONFIG_ARCH_STM32=y
  CONFIG_ARCH_SUNXI=y
 -CONFIG_ARCH_SIRF=y
  CONFIG_ARCH_TEGRA=y
 -CONFIG_ARCH_TEGRA_2x_SOC=y
 -CONFIG_ARCH_TEGRA_3x_SOC=y
 -CONFIG_ARCH_TEGRA_114_SOC=y
 -CONFIG_ARCH_TEGRA_124_SOC=y
  CONFIG_ARCH_UNIPHIER=y
  CONFIG_ARCH_U8500=y
 -CONFIG_MACH_HREFV60=y
 -CONFIG_MACH_SNOWBALL=y
  CONFIG_ARCH_VEXPRESS=y
  CONFIG_ARCH_VEXPRESS_TC2_PM=y
  CONFIG_ARCH_WM8850=y