projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51a8506 526b87f)
Merge tag 'at91-ab-4.8-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 12:06:14 +0000 (14:06 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 12:06:14 +0000 (14:06 +0200)
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

1  2 
arch/arm/configs/multi_v7_defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/configs/multi_v7_defconfig
index f6e7068525f571d958848e9e1a6daa7f5636b6d8,94c22b05e7448b07247e7d92981212f5e7d338f6..29e84c3f6e675809b6740708683f14b41d4a489e
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/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