Merge branch 'at91-4.1-trunk/defconfig' into linux-4.1-at91

linux4sam · Feb 25, 2016 · cf1022a · cf1022a
2 parents a7071b9 + e202013
commit cf1022a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
@@ -136,17 +136,20 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_SYSCON=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_RESET=y
+CONFIG_BATTERY_ACT8945A=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_AT91SAM9X_WATCHDOG=y
 CONFIG_SAMA5D4_WATCHDOG=y
+CONFIG_MFD_ACT8945A=y
 CONFIG_MFD_ATMEL_FLEXCOM=y
 CONFIG_MFD_ATMEL_HLCDC=y
 CONFIG_MFD_SYSCON=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
 CONFIG_REGULATOR_ACT8865=y
+CONFIG_REGULATOR_ACT8945A=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y