---

yaml --- r: 113047 b: refs/heads/master c: da86783 h: refs/heads/master i: 113045: f80ae3e 113043: 4ca821d 113039: e47a928 v: v3
git-mirror · Aug 29, 2008 · 0c4ba98 · 0c4ba98
1 parent a151c25
commit 0c4ba98
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 261 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8b75c4fd6e3bec57d268b76a0a9a8f58f1612e3
+refs/heads/master: da86783dda5ad8c64b945157108d1ace7aa79bbf
diff --git a/trunk/arch/sparc/include/asm/mc146818rtc_64.h b/trunk/arch/sparc/include/asm/mc146818rtc_64.h
@@ -7,12 +7,8 @@
 #include <asm/io.h>
 
 #ifndef RTC_PORT
-#ifdef CONFIG_PCI
-extern unsigned long ds1287_regs;
-#else
-#define ds1287_regs (0UL)
-#endif
-#define RTC_PORT(x)	(ds1287_regs + (x))
+extern unsigned long cmos_regs;
+#define RTC_PORT(x)	(cmos_regs + (x))
 #define RTC_ALWAYS_BCD	0
 #endif
 
@@ -29,6 +25,4 @@ outb_p((addr),RTC_PORT(0)); \
 outb_p((val),RTC_PORT(1)); \
 })
 
-#define RTC_IRQ 8
-
 #endif /* __ASM_SPARC64_MC146818RTC_H */
diff --git a/trunk/arch/sparc64/Kconfig b/trunk/arch/sparc64/Kconfig
@@ -21,6 +21,7 @@ config SPARC64
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select RTC_CLASS
 	select RTC_DRV_M48T59
+	select RTC_DRV_CMOS
 
 config GENERIC_TIME
 	bool