diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-01-23 03:25:56 (GMT) |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-03-04 23:43:03 (GMT) |
| commit | 9517746131f62294ddd922bcd288415be5104c23 (patch) | |
| tree | 1ca5433e9d25c1c2f34197a52bfa15fdec163fac /arch/m68k/platform/68328/config.c | |
| parent | d3f033f894c433d3c9bf347a0a84f45dac0b14ac (diff) | |
| download | linux-fsl-qoriq-9517746131f62294ddd922bcd288415be5104c23.tar.xz | |
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/68328/config.c')
| -rw-r--r-- | arch/m68k/platform/68328/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68k/platform/68328/config.c b/arch/m68k/platform/68328/config.c index d70bf26..44b8665 100644 --- a/arch/m68k/platform/68328/config.c +++ b/arch/m68k/platform/68328/config.c @@ -17,6 +17,7 @@ #include <linux/types.h> #include <linux/kernel.h> +#include <linux/rtc.h> #include <asm/system.h> #include <asm/machdep.h> #include <asm/MC68328.h> @@ -26,7 +27,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); /***************************************************************************/ @@ -48,7 +49,7 @@ void config_BSP(char *command, int len) printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n"); printk(KERN_INFO "68328/Pilot support Bernhard Kuhn <kuhn@lpr.e-technik.tu-muenchen.de>\n"); - mach_gettod = m68328_timer_gettod; + mach_hwclk = m68328_hwclk; mach_reset = m68328_reset; } |