diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2007-03-07 11:28:13 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 18:08:38 -0800 |
| commit | 1ed35e0d8afd7cd57f5b592e56f2af6794bab5c5 (patch) | |
| tree | aee6d6e57d9c6abc08600274fdaacbc62e4c016b | |
| parent | 8bb25184b3bed4930f65a138faf1905ca96054af (diff) | |
| download | lwn-1ed35e0d8afd7cd57f5b592e56f2af6794bab5c5.tar.gz lwn-1ed35e0d8afd7cd57f5b592e56f2af6794bab5c5.zip | |
[PATCH] m68knommu: use irq_handler_t and rtc_time in prototypes
Use irq_handler_t for passing clock handler routine around.
And use new rtc_time in place of hwclock_time.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/m68knommu/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index d5c25d27b64d..8133b1047353 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c @@ -51,7 +51,7 @@ static void dummy_waitbut(void) { } -void (*mach_sched_init) (irqreturn_t (*handler)(int, void *, struct pt_regs *)); +void (*mach_sched_init) (irq_handler_t handler); void (*mach_tick)( void ); /* machine dependent keyboard functions */ int (*mach_keyb_init) (void); @@ -66,7 +66,7 @@ void (*mach_trap_init) (void); /* machine dependent timer functions */ unsigned long (*mach_gettimeoffset) (void); void (*mach_gettod) (int*, int*, int*, int*, int*, int*); -int (*mach_hwclk) (int, struct hwclk_time*); +int (*mach_hwclk) (int, struct rtc_time*); int (*mach_set_clock_mmss) (unsigned long); void (*mach_mksound)( unsigned int count, unsigned int ticks ); void (*mach_reset)( void ); |