From: Olof Johansson Date: Mon, 19 Jun 2017 05:40:28 +0000 (-0700) Subject: Merge tag 'renesas-arm64-defconfig-for-v4.13' of https://git.kernel.org/pub/scm/linux... X-Git-Tag: v4.13-rc1~164^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e4140e649e5a7b48b7ae7a4fc01ab5f18ff1d1b1;p=karo-tx-linux.git Merge tag 'renesas-arm64-defconfig-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/arm64 Renesas ARM64 Based SoC Defconfig Updates for v4.13 * Enable Simple Sound Card support * tag 'renesas-arm64-defconfig-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: enable Simple Sound Card support Signed-off-by: Olof Johansson --- e4140e649e5a7b48b7ae7a4fc01ab5f18ff1d1b1 diff --cc arch/arm64/configs/defconfig index 03f32e0538a0,1bbac74a0c44..ebf794fcd3cd --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -365,9 -366,10 +365,10 @@@ CONFIG_SOUND= CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_BCM2835_SOC_I2S=m -CONFIG_SND_SOC_RCAR=y CONFIG_SND_SOC_SAMSUNG=y +CONFIG_SND_SOC_RCAR=y CONFIG_SND_SOC_AK4613=y + CONFIG_SND_SIMPLE_CARD=y CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y