diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
| commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
| tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /drivers/rtc | |
| parent | e28edb723e64200554194da17617ee6e82de6690 (diff) | |
| parent | 677f4f64e4b2336682f0e15c69b206ade6f6b131 (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||
| 781 | config RTC_DRV_MV | 781 | config 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 |