Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / drivers / rtc / rtc-s3c.c

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 3617c970caaa8d05b469b08bf5c57a26897a6f1b..8c1012b432bb1e71b9378f25d87eac404583fb77 100644 (file)
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -29,7 +29,7 @@
 
 #include <asm/mach/time.h>
 
-#include <asm/arch/regs-rtc.h>
+#include <asm/plat-s3c/regs-rtc.h>
 
 /* I have yet to find an S3C implementation with more than one
  * of these rtc blocks in */
@@ -548,37 +548,15 @@ static int ticnt_save;
 
 static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
-       struct rtc_time tm;
-       struct timespec time;
-
-       time.tv_nsec = 0;
-
        /* save TICNT for anyone using periodic interrupts */
-
        ticnt_save = readb(s3c_rtc_base + S3C2410_TICNT);
-
-       /* calculate time delta for suspend */
-
-       s3c_rtc_gettime(&pdev->dev, &tm);
-       rtc_tm_to_time(&tm, &time.tv_sec);
-       save_time_delta(&s3c_rtc_delta, &time);
        s3c_rtc_enable(pdev, 0);
-
        return 0;
 }
 
 static int s3c_rtc_resume(struct platform_device *pdev)
 {
-       struct rtc_time tm;
-       struct timespec time;
-
-       time.tv_nsec = 0;
-
        s3c_rtc_enable(pdev, 1);
-       s3c_rtc_gettime(&pdev->dev, &tm);
-       rtc_tm_to_time(&tm, &time.tv_sec);
-       restore_time_delta(&s3c_rtc_delta, &time);
-
        writeb(ticnt_save, s3c_rtc_base + S3C2410_TICNT);
        return 0;
 }