aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/dove_defconfig3
-rw-r--r--drivers/rtc/Kconfig2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 837bb522d462..b3a491675d59 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.32-rc6 3# Linux kernel version: 2.6.32-rc6
4# Tue Nov 24 13:51:23 2009 4# Tue Nov 24 13:53:37 2009
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1209,6 +1209,7 @@ CONFIG_RTC_INTF_DEV=y
1209# 1209#
1210# on-CPU RTC drivers 1210# on-CPU RTC drivers
1211# 1211#
1212CONFIG_RTC_DRV_MV=y
1212CONFIG_DMADEVICES=y 1213CONFIG_DMADEVICES=y
1213 1214
1214# 1215#
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 3c20dae43ce2..e11e1cda4ba2 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -780,7 +780,7 @@ config RTC_DRV_TX4939
780 780
781config RTC_DRV_MV 781config RTC_DRV_MV
782 tristate "Marvell SoC RTC" 782 tristate "Marvell SoC RTC"
783 depends on ARCH_KIRKWOOD 783 depends on ARCH_KIRKWOOD || ARCH_DOVE
784 help 784 help
785 If you say yes here you will get support for the in-chip RTC 785 If you say yes here you will get support for the in-chip RTC
786 that can be found in some of Marvell's SoC devices, such as 786 that can be found in some of Marvell's SoC devices, such as