From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 29 Feb 2016 15:17:30 +0000 (+0100)
Subject: Merge tag 'renesas-arm64-defconfig-for-v4.6' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=107adb57f204f3c27c692d931902ab3b10fc9187;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'renesas-arm64-defconfig-for-v4.6' of git://git./linux/kernel/git/horms/renesas into next/arm64

Merge "Renesas ARM64 Based SoC Defconfig Updates for v4.6" from Simon Horman:

* Enable Renesas R-Car Gen3 USB 2.0 phy driver
  which is used on the r8a7795/salvator-x

* tag 'renesas-arm64-defconfig-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support
---

107adb57f204f3c27c692d931902ab3b10fc9187
diff --cc arch/arm64/configs/defconfig
index 0c713fedfe8b,eaf738a59927..73db43c2e71f
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -232,7 -213,7 +232,8 @@@ CONFIG_QCOM_SMD_RPM=
  CONFIG_ARCH_TEGRA_132_SOC=y
  CONFIG_ARCH_TEGRA_210_SOC=y
  CONFIG_HISILICON_IRQ_MBIGEN=y
 +CONFIG_EXTCON_USB_GPIO=y
+ CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_XGENE=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y