summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-02-29 16:17:30 +0100
committerArnd Bergmann <arnd@arndb.de>2016-02-29 16:17:30 +0100
commit107adb57f204f3c27c692d931902ab3b10fc9187 (patch)
tree883fa68bcf8062dcd12c1be0d13486c84b3b1c8a
parentebb7c983b57fcfff93443f041693745177244423 (diff)
parenta9c42f02387ce8a231bce7c0901ef15fe4bfc3b4 (diff)
downloadop-kernel-dev-107adb57f204f3c27c692d931902ab3b10fc9187.zip
op-kernel-dev-107adb57f204f3c27c692d931902ab3b10fc9187.tar.gz
Merge tag 'renesas-arm64-defconfig-for-v4.6' of git://git.kernel.org/pub/scm/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
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 0c713fe..73db43c 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -233,6 +233,7 @@ 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
OpenPOWER on IntegriCloud