summaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/68VZ328
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2012-01-23 13:25:56 +1000
committerGreg Ungerer <gerg@uclinux.org>2012-03-05 09:43:03 +1000
commit9517746131f62294ddd922bcd288415be5104c23 (patch)
tree1ca5433e9d25c1c2f34197a52bfa15fdec163fac /arch/m68k/platform/68VZ328
parentd3f033f894c433d3c9bf347a0a84f45dac0b14ac (diff)
m68knommu: make persistent clock code consistent with m68k
The read_persistent_clock() code is different on m68knommu, for really no reason. With a few changes to support function names and some code re-organization the code can be made the same. This will make it easier to merge the arch/m68k/kernel/time.c for m68k and m68knommu in a future patch. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/68VZ328')
-rw-r--r--arch/m68k/platform/68VZ328/config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68k/platform/68VZ328/config.c b/arch/m68k/platform/68VZ328/config.c
index eabaabe8af3..25ec673edc2 100644
--- a/arch/m68k/platform/68VZ328/config.c
+++ b/arch/m68k/platform/68VZ328/config.c
@@ -20,6 +20,7 @@
#include <linux/netdevice.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/rtc.h>
#include <asm/system.h>
#include <asm/pgtable.h>
@@ -33,7 +34,7 @@
/***************************************************************************/
-void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
+int m68328_hwclk(int set, struct rtc_time *t);
/***************************************************************************/
/* Init Drangon Engine hardware */
@@ -181,7 +182,7 @@ void config_BSP(char *command, int size)
init_hardware(command, size);
- mach_gettod = m68328_timer_gettod;
+ mach_hwclk = m68328_hwclk;
mach_reset = m68vz328_reset;
}