2 files changed, 4 insertions, 52 deletions

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 1734d96422c6..86f6ca36363f 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -53,6 +53,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config GENERIC_TIME
+        bool
+        default y
+
 config TIME_LOW_RES
         bool
         default y
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c
index d1ef615ba895..91d3b56ddc68 100644
--- a/arch/h8300/kernel/time.c
+++ b/arch/h8300/kernel/time.c
@@ -66,55 +66,3 @@ void time_init(void)
 
         platform_timer_setup(timer_interrupt);
 }
-
-/*
- * This version of gettimeofday has near microsecond resolution.
- */
-void do_gettimeofday(struct timeval *tv)
-{
-        unsigned long flags;
-        unsigned long usec, sec;
-
-        read_lock_irqsave(&xtime_lock, flags);
-        usec = 0;
-        sec = xtime.tv_sec;
-        usec += (xtime.tv_nsec / 1000);
-        read_unlock_irqrestore(&xtime_lock, flags);
-
-        while (usec >= 1000000) {
-                usec -= 1000000;
-                sec++;
-        }
-
-        tv->tv_sec = sec;
-        tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
-int do_settimeofday(struct timespec *tv)
-{
-        if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-                return -EINVAL;
-
-        write_lock_irq(&xtime_lock);
-        /* This is revolting. We need to set the xtime.tv_usec
-         * correctly. However, the value in this location is
-         * is value at the last tick.
-         * Discover what correction gettimeofday
-         * would have done, and then undo it!
-         */
-        while (tv->tv_nsec < 0) {
-                tv->tv_nsec += NSEC_PER_SEC;
-                tv->tv_sec--;
-        }
-
-        xtime.tv_sec = tv->tv_sec;
-        xtime.tv_nsec = tv->tv_nsec;
-        ntp_clear();
-        write_sequnlock_irq(&xtime_lock);
-        clock_was_set();
-        return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);