diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 17:53:39 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 17:53:39 +0300 |
| commit | 4752e2076f574445cddb146df3d183394131585c (patch) | |
| tree | db7d402400f963ae04295774b3a24d7ae6a7dd54 /arch | |
| parent | dfee81513cc42d08e40b0532076ce9ced65b82bd (diff) | |
| parent | cb6a7a9e00fda1d51880ac0e93ad54a87034e822 (diff) | |
| download | linux-4752e2076f574445cddb146df3d183394131585c.tar.xz | |
Merge tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/defconfig
Merge "STi defconfig for v4.2, round 1" from Maxime Coquelin:
Highlights:
-----------
- Enable ST's LPC Watchdog driver
- Enable ST's LPC RTC driver
* tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: multi_v7_defconfig: Enable support for ST's LPC RTC
ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 39366b713d0b..a9401b188879 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -341,6 +341,7 @@ CONFIG_WATCHDOG=y CONFIG_XILINX_WATCHDOG=y CONFIG_ARM_SP805_WATCHDOG=y CONFIG_ORION_WATCHDOG=y +CONFIG_ST_LPC_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y CONFIG_MESON_WATCHDOG=y CONFIG_MFD_AS3711=y @@ -506,6 +507,7 @@ CONFIG_RTC_DRV_MAX8907=y CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_PALMAS=y +CONFIG_RTC_DRV_ST_LPC=y CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_TPS6586X=y CONFIG_RTC_DRV_TPS65910=y |