diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/m68k/mac/macboing.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/m68k/mac/macboing.c')
| -rw-r--r-- | arch/m68k/mac/macboing.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 |