From 7cae7ef89e360cd3dc139eaac2f480c25bc7bfa1 Mon Sep 17 00:00:00 2001 From: Rask Ingemann Lambertsen Date: Wed, 8 Feb 2017 23:09:31 +0100 Subject: ARM: multi_v7_defconfig: Switch AXP20x driver from module to built-in The AXP20X regulator support is currently built as a module, which means it's not available until the root fs has been mounted, but the boot loader might not have enabled the required regulators, so build their drivers into the kernel. Signed-off-by: Rask Ingemann Lambertsen Signed-off-by: Maxime Ripard --- arch/arm/configs/multi_v7_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index cfa3ae2e55e9..36c1b39cfb54 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -484,8 +484,8 @@ CONFIG_MFD_ATMEL_HLCDC=m CONFIG_MFD_BCM590XX=y CONFIG_MFD_AC100=y CONFIG_MFD_AXP20X=y -CONFIG_MFD_AXP20X_I2C=m -CONFIG_MFD_AXP20X_RSB=m +CONFIG_MFD_AXP20X_I2C=y +CONFIG_MFD_AXP20X_RSB=y CONFIG_MFD_CROS_EC=m CONFIG_MFD_CROS_EC_I2C=m CONFIG_MFD_CROS_EC_SPI=m @@ -514,7 +514,7 @@ CONFIG_REGULATOR_ACT8865=y CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_AS3711=y CONFIG_REGULATOR_AS3722=y -CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_AXP20X=y CONFIG_REGULATOR_BCM590XX=y CONFIG_REGULATOR_DA9210=y CONFIG_REGULATOR_FAN53555=y -- cgit