diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-16 16:36:37 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-16 16:36:37 -0700 |
commit | fd5812e0a5816ff0dc665485bb3746e788cbd48e (patch) | |
tree | d854c160a429708a82d8b413645b918ce2fc21b7 /arch/arm/configs | |
parent | 3b164b7b5260b8006a5dee00554d69ad0d79743f (diff) | |
parent | b22f6bb030ee0c98839fe2445571c57c9f89594e (diff) | |
download | blackbird-obmc-linux-fd5812e0a5816ff0dc665485bb3746e788cbd48e.tar.gz blackbird-obmc-linux-fd5812e0a5816ff0dc665485bb3746e788cbd48e.zip |
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: armadillo800eva: Add support RTC
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 7d8718468e0d..05f523d7d87f 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -85,6 +85,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8 CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y +CONFIG_I2C_GPIO=y CONFIG_I2C_SH_MOBILE=y # CONFIG_HWMON is not set CONFIG_MEDIA_SUPPORT=y @@ -120,6 +121,8 @@ CONFIG_USB_ETH=m CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_S35390A=y CONFIG_DMADEVICES=y CONFIG_SH_DMAE=y CONFIG_UIO=y |