MN10300: Fix MN10300's serial port driver to get at its tty_struct

[linux-2.6-omap-h63xx.git] / drivers / rtc / rtc-s3c.c

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 9f4d5129a496a445bce3ae90c89bfc9e0746f875..fed86e507fdfb87aa17e610d1758317731fc1990 100644 (file)
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -26,10 +26,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/rtc.h>
-
-#include <asm/mach/time.h>
-
 #include <asm/plat-s3c/regs-rtc.h>
 
 /* I have yet to find an S3C implementation with more than one
@@ -68,7 +64,7 @@ static void s3c_rtc_setaie(int to)
 {
        unsigned int tmp;
 
-       pr_debug("%s: aie=%d\n", __FUNCTION__, to);
+       pr_debug("%s: aie=%d\n", __func__, to);
 
        tmp = readb(s3c_rtc_base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN;
 
@@ -82,7 +78,7 @@ static void s3c_rtc_setpie(int to)
 {
        unsigned int tmp;
 
-       pr_debug("%s: pie=%d\n", __FUNCTION__, to);
+       pr_debug("%s: pie=%d\n", __func__, to);
 
        spin_lock_irq(&s3c_rtc_pie_lock);
        tmp = readb(s3c_rtc_base + S3C2410_TICNT) & ~S3C2410_TICNT_ENABLE;
@@ -457,7 +453,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
        struct resource *res;
        int ret;
 
-       pr_debug("%s: probe=%p\n", __FUNCTION__, pdev);
+       pr_debug("%s: probe=%p\n", __func__, pdev);
 
        /* find the IRQs */