From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Feb 2015 17:44:50 +0000 (-0800)
Subject: Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.0-rc1~67
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=03a40e29941cf7b12d9eef92cd1a56e04affbc06;p=linux-2.6-block.git

Merge tag 'defconfig-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC defconfig changes from Olof Johansson:
 "Most of these changes are to enable new drivers that have been merged,
  or various additions to make defconfigs more useful.  There's also a
  set of patches trimming down omap2plus kernel size a bit since it is
  quite large"

* tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  ARM: config: add DEVTMPFS option by default to keystone config
  ARM: multi_v7_defconfig: Enable Exynos5420 Multi-Cluster PM support
  ARM: shmobile: Select CONFIG_REGULATOR in defconfig once again
  ARM: exynos_defconfig: Enable CONFIG_FHANDLE
  ARM: exynos_defconfig: Enable PMIC and MUIC drivers for Gears and Trats2
  ARM: exynos_defconfig: Enable CONFIG_LOCKUP_DETECTOR
  ARM: config: enable ARCH_HIP01
  ARM: omap2plus_defconfig: Enable OHCI & EHCI HCD support
  ARM: omap2plus_defconfig: Enable misc options for BeagleBoard-X15 platform
  ARM: imx_v6_v7_defconfig: enable more USB functions
  ARM: imx_v6_v7_defconfig: Select CONFIG_FB_MXS
  ARM: omap2plus_defconfig: Enable pcf857x
  ARM: omap2plus_defconfig: Add NOR flash support
  ARM: omap2plus_defconfig: Enable support for davinci_emac
  ARM: multi_v7_defconfig: Enable MiPHY28lp - ST's Generic (SATA, PCIe & USB3) PHY
  ARM: efm32: update defconfig
  ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
  ARM: multi_v7_defconfig: Enable Hip01 platform
  ARM: config: multi_v7: Update it for Keystone defconfig
  ARM: shmobile: Enable kzm9g board in multiplatform defconfig
  ...
---

03a40e29941cf7b12d9eef92cd1a56e04affbc06
diff --cc arch/arm/configs/shmobile_defconfig
index e4a6c5e9174d,b553e2c45e86..b17036088726
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@@ -17,8 -17,9 +17,8 @@@ CONFIG_ARCH_R8A7779=
  CONFIG_ARCH_R8A7790=y
  CONFIG_ARCH_R8A7791=y
  CONFIG_ARCH_R8A7794=y
+ CONFIG_ARCH_SH73A0=y
 -CONFIG_MACH_LAGER=y
  CONFIG_MACH_MARZEN=y
- # CONFIG_SWP_EMULATE is not set
  CONFIG_CPU_BPREDICT_DISABLE=y
  CONFIG_PL310_ERRATA_588369=y
  CONFIG_ARM_ERRATA_754322=y