From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 Jul 2016 12:06:14 +0000 (+0200)
Subject: Merge tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1ed59b8f4390df4d4ee77b85f1681a3056c10a24;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'at91-ab-4.8-defconfig2' of git://git./linux/kernel/git/abelloni/linux into next/defconfig

Merge "Defconfig changes for 4.8 #2:" from Alexandre Belloni:

 - Addition of the sama5d2 xplained PMIC: ACT8945A

* tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: multi_v7_defconfig: add ACT8945A
  ARM: at91/defconfig: Add ACT8945A driver
---

1ed59b8f4390df4d4ee77b85f1681a3056c10a24
diff --cc arch/arm/configs/multi_v7_defconfig
index f6e7068525f5,94c22b05e744..29e84c3f6e67
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -461,8 -449,7 +462,9 @@@ CONFIG_MESON_WATCHDOG=
  CONFIG_DW_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
 +CONFIG_BCM7038_WDT=m
 +CONFIG_BCM_KONA_WDT=y
+ CONFIG_MFD_ACT8945A=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_ATMEL_FLEXCOM=y