diff options
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index d2810c52d84b..858a5f1713e0 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -399,7 +399,8 @@ CONFIG_ROCKCHIP_IODOMAIN=y | |||
399 | CONFIG_SENSORS_LM90=y | 399 | CONFIG_SENSORS_LM90=y |
400 | CONFIG_SENSORS_LM95245=y | 400 | CONFIG_SENSORS_LM95245=y |
401 | CONFIG_SENSORS_NTC_THERMISTOR=m | 401 | CONFIG_SENSORS_NTC_THERMISTOR=m |
402 | CONFIG_THERMAL=y | 402 | CONFIG_SENSORS_PWM_FAN=m |
403 | CONFIG_SENSORS_INA2XX=m | ||
403 | CONFIG_CPU_THERMAL=y | 404 | CONFIG_CPU_THERMAL=y |
404 | CONFIG_ROCKCHIP_THERMAL=y | 405 | CONFIG_ROCKCHIP_THERMAL=y |
405 | CONFIG_RCAR_THERMAL=y | 406 | CONFIG_RCAR_THERMAL=y |
@@ -539,7 +540,7 @@ CONFIG_SND_HDA_INPUT_BEEP=y | |||
539 | CONFIG_SND_HDA_PATCH_LOADER=y | 540 | CONFIG_SND_HDA_PATCH_LOADER=y |
540 | CONFIG_SND_HDA_CODEC_REALTEK=m | 541 | CONFIG_SND_HDA_CODEC_REALTEK=m |
541 | CONFIG_SND_HDA_CODEC_HDMI=m | 542 | CONFIG_SND_HDA_CODEC_HDMI=m |
542 | CONFIG_SND_USB_AUDIO=y | 543 | CONFIG_SND_USB_AUDIO=m |
543 | CONFIG_SND_SOC=m | 544 | CONFIG_SND_SOC=m |
544 | CONFIG_SND_ATMEL_SOC=m | 545 | CONFIG_SND_ATMEL_SOC=m |
545 | CONFIG_SND_ATMEL_SOC_WM8904=m | 546 | CONFIG_SND_ATMEL_SOC_WM8904=m |
@@ -547,6 +548,9 @@ CONFIG_SND_SOC_FSL_SAI=m | |||
547 | CONFIG_SND_SOC_SH4_FSI=m | 548 | CONFIG_SND_SOC_SH4_FSI=m |
548 | CONFIG_SND_SOC_RCAR=m | 549 | CONFIG_SND_SOC_RCAR=m |
549 | CONFIG_SND_SOC_RSRC_CARD=m | 550 | CONFIG_SND_SOC_RSRC_CARD=m |
551 | CONFIG_SND_SOC_SAMSUNG=m | ||
552 | CONFIG_SND_SOC_SNOW=m | ||
553 | CONFIG_SND_SOC_ODROIDX2=m | ||
550 | CONFIG_SND_SOC_TEGRA=m | 554 | CONFIG_SND_SOC_TEGRA=m |
551 | CONFIG_SND_SOC_TEGRA_RT5640=m | 555 | CONFIG_SND_SOC_TEGRA_RT5640=m |
552 | CONFIG_SND_SOC_TEGRA_WM8753=m | 556 | CONFIG_SND_SOC_TEGRA_WM8753=m |