aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-15 18:00:40 +0200
committerArnd Bergmann <arnd@arndb.de>2017-08-15 18:00:40 +0200
commit01d1cddb201682cd3280b581688306123973dfa4 (patch)
treedd316f6f2a5b5fd63a0628a3307763730706aec5
parentarm64: defconfig: Enable CONFIG_WQ_POWER_EFFICIENT_DEFAULT (diff)
parentarm64: defconfig: compile ak4613 and renesas sound as modules (diff)
downloadlinux-dev-01d1cddb201682cd3280b581688306123973dfa4.tar.xz
linux-dev-01d1cddb201682cd3280b581688306123973dfa4.zip
Merge tag 'renesas-arm64-defconfig-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/arm64
Pull "Renesas ARM64 Based SoC Defconfig Updates for v4.14" from Simon Horman: * compile ak4613 and renesas sound as modules This is intended to reduce the size of a kernel image compiled using the defconfig. This is timely as it brings the kernel image back below the size that can be booted in my environment, a limit it crept over in v4.13-rc1. * tag 'renesas-arm64-defconfig-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: compile ak4613 and renesas sound as modules
-rw-r--r--arch/arm64/configs/defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index b13621e3bb19..d81fdbe40bf0 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -381,8 +381,8 @@ CONFIG_SND=y
CONFIG_SND_SOC=y
CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_SOC_SAMSUNG=y
-CONFIG_SND_SOC_RCAR=y
-CONFIG_SND_SOC_AK4613=y
+CONFIG_SND_SOC_RCAR=m
+CONFIG_SND_SOC_AK4613=m
CONFIG_SND_SIMPLE_CARD=y
CONFIG_USB=y
CONFIG_USB_OTG=y