diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:45 +0200 |
| commit | 9cce00617bf67a462eabd8c473c423f78414a8e8 (patch) | |
| tree | 950cab0665633f390ad04b9b2b5147f10a4be896 /arch/arm/configs | |
| parent | ba465b6c4dc4b0729e98f1581a13ad7e01032461 (diff) | |
| parent | 642f8fbed8b4c55d56a0934b803146009539905e (diff) | |
| download | barebox-9cce00617bf67a462eabd8c473c423f78414a8e8.tar.gz barebox-9cce00617bf67a462eabd8c473c423f78414a8e8.tar.xz | |
Merge branch 'for-next/rtc'
Conflicts:
arch/mips/dts/jz4755.dtsi
commands/Makefile
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/versatilepb_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/versatilepb_defconfig b/arch/arm/configs/versatilepb_defconfig index 58dfb8b555..a447f93292 100644 --- a/arch/arm/configs/versatilepb_defconfig +++ b/arch/arm/configs/versatilepb_defconfig @@ -51,6 +51,8 @@ CONFIG_DRIVER_NET_SMC91111=y CONFIG_I2C=y CONFIG_I2C_VERSATILE=y CONFIG_GPIO_PL061=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=y CONFIG_FS_CRAMFS=y CONFIG_FS_TFTP=y CONFIG_SHA1=y |