diff options
author | Greg Ungerer <gerg@snapgear.com> | 2007-03-06 20:28:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 21:08:38 -0500 |
commit | 1ed35e0d8afd7cd57f5b592e56f2af6794bab5c5 (patch) | |
tree | aee6d6e57d9c6abc08600274fdaacbc62e4c016b /arch | |
parent | 8bb25184b3bed4930f65a138faf1905ca96054af (diff) |
[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>
Diffstat (limited to 'arch')
-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) | |||
51 | { | 51 | { |
52 | } | 52 | } |
53 | 53 | ||
54 | void (*mach_sched_init) (irqreturn_t (*handler)(int, void *, struct pt_regs *)); | 54 | void (*mach_sched_init) (irq_handler_t handler); |
55 | void (*mach_tick)( void ); | 55 | void (*mach_tick)( void ); |
56 | /* machine dependent keyboard functions */ | 56 | /* machine dependent keyboard functions */ |
57 | int (*mach_keyb_init) (void); | 57 | int (*mach_keyb_init) (void); |
@@ -66,7 +66,7 @@ void (*mach_trap_init) (void); | |||
66 | /* machine dependent timer functions */ | 66 | /* machine dependent timer functions */ |
67 | unsigned long (*mach_gettimeoffset) (void); | 67 | unsigned long (*mach_gettimeoffset) (void); |
68 | void (*mach_gettod) (int*, int*, int*, int*, int*, int*); | 68 | void (*mach_gettod) (int*, int*, int*, int*, int*, int*); |
69 | int (*mach_hwclk) (int, struct hwclk_time*); | 69 | int (*mach_hwclk) (int, struct rtc_time*); |
70 | int (*mach_set_clock_mmss) (unsigned long); | 70 | int (*mach_set_clock_mmss) (unsigned long); |
71 | void (*mach_mksound)( unsigned int count, unsigned int ticks ); | 71 | void (*mach_mksound)( unsigned int count, unsigned int ticks ); |
72 | void (*mach_reset)( void ); | 72 | void (*mach_reset)( void ); |