diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2020-04-14 00:55:35 +0200 |
---|---|---|
committer | Florian Fainelli <f.fainelli@gmail.com> | 2020-04-14 00:55:35 +0200 |
commit | 35cdc3fa00ee3aebf1a25f55db8a114cbb612092 (patch) | |
tree | 7f7d1a74b6d1f7447aee84b4e50503b565c8ef7e /arch/arm/configs/bcm2835_defconfig | |
parent | Linux 5.7-rc1 (diff) | |
parent | ARM: bcm2835_defconfig: Enable fixed-regulator (diff) | |
download | linux-35cdc3fa00ee3aebf1a25f55db8a114cbb612092.tar.xz linux-35cdc3fa00ee3aebf1a25f55db8a114cbb612092.zip |
Merge tag 'tags/bcm2835-defconfig-next-2020-03-27' into defconfig/next
Enables fixed regulator in bcm2835_defconfig
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/configs/bcm2835_defconfig')
-rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 8e7a3ed2a4df..44ff9cd88d81 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -103,6 +103,7 @@ CONFIG_WATCHDOG=y CONFIG_BCM2835_WDT=y CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y |