This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / syslib / todc_time.c

diff --git a/arch/ppc/syslib/todc_time.c b/arch/ppc/syslib/todc_time.c
index 0165e18..1dc7e0b 100644 (file)
--- a/arch/ppc/syslib/todc_time.c
+++ b/arch/ppc/syslib/todc_time.c
@@ -18,7 +18,6 @@
 #include <linux/time.h>
 #include <linux/timex.h>
 #include <linux/bcd.h>
-#include <linux/mc146818rtc.h>
 
 #include <asm/machdep.h>
 #include <asm/io.h>
@@ -49,6 +48,8 @@
  *                                             --MAG
  */
 
+extern spinlock_t      rtc_lock;
+
 /*
  * 'todc_info' should be initialized in your *_setup.c file to
  * point to a fully initialized 'todc_info_t' structure.
@@ -81,13 +82,13 @@
 u_char
 todc_direct_read_val(int addr)
 {
-       return readb((void __iomem *)(todc_info->nvram_data + addr));
+       return readb(todc_info->nvram_data + addr);
 }
 
 void
 todc_direct_write_val(int addr, unsigned char val)
 {
-       writeb(val, (void __iomem *)(todc_info->nvram_data + addr));
+       writeb(val, todc_info->nvram_data + addr);
        return;
 }