Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc:
  powerpc/ps3: Add rtc-ps3
  powerpc: Hook up rtc-generic, and kill rtc-ppc
  m68k: Hook up rtc-generic
  parisc: rtc: Rename rtc-parisc to rtc-generic
  parisc: rtc: Add missing module alias
  parisc: rtc: platform_driver_probe() fixups
  parisc: rtc: get_rtc_time() returns unsigned int

1 files changed, 17 insertions, 14 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 56002f7d26bd..ffe34a12f446 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -688,22 +688,16 @@ config RTC_DRV_RS5C313
         help
           If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 
-config RTC_DRV_PARISC
-        tristate "PA-RISC firmware RTC support"
-        depends on PARISC
-        help
-          Say Y or M here to enable RTC support on PA-RISC systems using
-          firmware calls. If you do not know what you are doing, you should
+config RTC_DRV_GENERIC
+        tristate "Generic RTC support"
+        # Please consider writing a new RTC driver instead of using the generic
+        # RTC abstraction
+        depends on PARISC || M68K || PPC
+        help
+          Say Y or M here to enable RTC support on systems using the generic
+          RTC abstraction. If you do not know what you are doing, you should
           just say Y.
 
-config RTC_DRV_PPC
-       tristate "PowerPC machine dependent RTC support"
-       depends on PPC
-       help
-         The PowerPC kernel has machine-specific functions for accessing
-         the RTC. This exposes that functionality through the generic RTC
-         class.
-
 config RTC_DRV_PXA
        tristate "PXA27x/PXA3xx"
        depends on ARCH_PXA
@@ -747,4 +741,13 @@ config RTC_DRV_MV
           This driver can also be built as a module. If so, the module
           will be called rtc-mv.
 
+config RTC_DRV_PS3
+        tristate "PS3 RTC"
+        depends on PPC_PS3
+        help
+          If you say yes here you will get support for the RTC on PS3.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ps3.
+
 endif # RTC_CLASS