diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/amiga/amisound.c | 2 | ||||
-rw-r--r-- | arch/m68k/mac/macboing.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c index cb5d93630467..bd5d134e9f12 100644 --- a/arch/m68k/amiga/amisound.c +++ b/arch/m68k/amiga/amisound.c | |||
@@ -63,7 +63,7 @@ void __init amiga_init_sound(void) | |||
63 | } | 63 | } |
64 | 64 | ||
65 | static void nosound( unsigned long ignored ); | 65 | static void nosound( unsigned long ignored ); |
66 | static struct timer_list sound_timer = TIMER_INITIALIZER(nosound, 0, 0); | 66 | static DEFINE_TIMER(sound_timer, nosound, 0, 0); |
67 | 67 | ||
68 | void amiga_mksound( unsigned int hz, unsigned int ticks ) | 68 | void amiga_mksound( unsigned int hz, unsigned int ticks ) |
69 | { | 69 | { |
diff --git a/arch/m68k/mac/macboing.c b/arch/m68k/mac/macboing.c index 44c5cd2ad6a8..8f0640847ad2 100644 --- a/arch/m68k/mac/macboing.c +++ b/arch/m68k/mac/macboing.c | |||
@@ -56,8 +56,7 @@ static void ( *mac_special_bell )( unsigned int, unsigned int, unsigned int ); | |||
56 | /* | 56 | /* |
57 | * our timer to start/continue/stop the bell | 57 | * our timer to start/continue/stop the bell |
58 | */ | 58 | */ |
59 | static struct timer_list mac_sound_timer = | 59 | static DEFINE_TIMER(mac_sound_timer, mac_nosound, 0, 0); |
60 | TIMER_INITIALIZER(mac_nosound, 0, 0); | ||
61 | 60 | ||
62 | /* | 61 | /* |
63 | * Sort of initialize the sound chip (called from mac_mksound on the first | 62 | * Sort of initialize the sound chip (called from mac_mksound on the first |