diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 08:16:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 08:16:14 -0700 |
commit | 81ca98036985559c49480007371af94aa6e85dc0 (patch) | |
tree | 1d4f400a40b573d1405ccd0a7d869e9859a30408 /drivers/rtc/Kconfig | |
parent | 9a41fe3415bbef2c0c08ac232dc3a17add0dee58 (diff) | |
parent | 4db25d496c09fdf094d52d11a90ae51f9ee473c6 (diff) |
Merge branch 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix mmap2 for handling differing PAGE_SIZEs.
sh: sh7723: Don't default enable the RTC clock.
sh: sh7722: Don't default enable the RTC clock.
rtc: rtc-sh: clock framework support.
Diffstat (limited to 'drivers/rtc/Kconfig')
-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 ffe34a12f44..4e9851fc174 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -573,7 +573,7 @@ config RTC_DRV_SA1100 config RTC_DRV_SH tristate "SuperH On-Chip RTC" - depends on RTC_CLASS && SUPERH + depends on RTC_CLASS && SUPERH && HAVE_CLK help Say Y here to enable support for the on-chip RTC found in most SuperH processors. |