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 09660e2..ef1eae9 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1,4 +1,4 @@
-\#
+#
 # RTC class/drivers configuration
 #
 
@@ -95,6 +95,29 @@ config RTC_INTF_DEV_UIE_EMUL
 comment "RTC drivers"
        depends on RTC_CLASS
 
+# this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h>
+# requires <asm/mc146818rtc.h> defining CMOS_READ/CMOS_WRITE, and a
+# global rtc_lock ... it's not yet just another platform_device.
+
+config RTC_DRV_CMOS
+       tristate "PC-style 'CMOS' real time clock"
+       depends on RTC_CLASS && (X86 || ALPHA || ARM26 || ARM \
+               || M32R || ATARI || POWERPC)
+       help
+         Say "yes" here to get direct support for the real time clock
+         found in every PC or ACPI-based system, and some other boards.
+         Specifically the original MC146818, compatibles like those in
+         PC south bridges, the DS12887 or M48T86, some multifunction
+         or LPC bus chips, and so on.
+
+         Your system will need to define the platform device used by
+         this driver, otherwise it won't be accessible.  This means
+         you can safely enable this driver if you don't know whether
+         or not your board has this kind of hardware.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-cmos.
+
 config RTC_DRV_X1205
        tristate "Xicor/Intersil X1205"
        depends on RTC_CLASS && I2C
@@ -184,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.
@@ -329,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