summaryrefslogtreecommitdiff
path: root/arch/arm/configs/sama5_defconfig
diff options
context:
space:
mode:
authorWenyou Yang <wenyou.yang@atmel.com>2014-05-27 14:45:21 +0200
committerOlof Johansson <olof@lixom.net>2014-05-27 09:46:06 -0700
commit0279394672bf2299a4d3a994c56536bb484922e3 (patch)
tree95a6b86e06f5260b935ddb228582d23b0e2c347e /arch/arm/configs/sama5_defconfig
parent11fd0a41cdb7e113919076c029cafe674c6d8eb3 (diff)
ARM: at91/defconfig: sama5_defconfig: updated
due to enabling -- CONFIG_REGULATOR -- CONFIG_REGULATOR_ACT8865 Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> [nicolas.ferre@atmel.com: move added entries to proper location within file] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/sama5_defconfig')
-rw-r--r--arch/arm/configs/sama5_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index dc3881e07630..b460ebdd8ce9 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -138,6 +138,8 @@ CONFIG_SPI_GPIO=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_SSB=m
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_ACT8865=y
CONFIG_FB=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set