Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[cascardo/linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index deef296..ef1eae9 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -207,10 +207,12 @@ config RTC_DRV_PCF8563
 
 config RTC_DRV_PCF8583
        tristate "Philips PCF8583"
-       depends on RTC_CLASS && I2C
+       depends on RTC_CLASS && I2C && ARCH_RPC
        help
-         If you say yes here you get support for the
-         Philips PCF8583 RTC chip.
+         If you say yes here you get support for the Philips PCF8583
+         RTC chip found on Acorn RiscPCs.  This driver supports the
+         platform specific method of retrieving the current year from
+         the RTC's SRAM.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-pcf8583.
@@ -352,4 +354,14 @@ config RTC_DRV_V3020
          This driver can also be built as a module. If so, the module
          will be called rtc-v3020.
 
+config RTC_DRV_BFIN
+       tristate "Blackfin On-Chip RTC"
+       depends on RTC_CLASS && BFIN
+       help
+         If you say yes here you will get support for the
+         Blackfin On-Chip Real Time Clock.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-bfin.
+
 endmenu