projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11fd0a4)
ARM: at91/defconfig: sama5_defconfig: updated
authorWenyou Yang <wenyou.yang@atmel.com>
Tue, 27 May 2014 12:45:21 +0000 (14:45 +0200)
committerOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 16:46:06 +0000 (09:46 -0700)
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>
arch/arm/configs/sama5_defconfig patch | blob | blame | history

diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index dc3881e07630c8924356436936927d020055862a..b460ebdd8ce9678927fdb94998fd7405d0462bad 100644 (file)
--- 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