diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-15 03:32:22 +0000 |
| commit | f1da2c3860e301527d56a1ef0b56c649ee7c4b1b (patch) | |
| tree | 562b5d2e8b9cb62eb983d78ff6bcf9789e08fcf6 /arch/m68k/apollo | |
| parent | 00f11569ac8ca73cbcdef8822de1583e79aee571 (diff) | |
Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.
The IP22 cache bugs which are plaguing some machines are still unfixed.
Diffstat (limited to 'arch/m68k/apollo')
| -rw-r--r-- | arch/m68k/apollo/dn_ints.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c index e3a628107..d46ba0852 100644 --- a/arch/m68k/apollo/dn_ints.c +++ b/arch/m68k/apollo/dn_ints.c @@ -128,8 +128,7 @@ static void dn_nosound (unsigned long ignored) { void dn_mksound( unsigned int count, unsigned int ticks ) { - static struct timer_list sound_timer = { NULL, NULL, 0, 0, - dn_nosound }; + static struct timer_list sound_timer = { function: dn_nosound }; del_timer( &sound_timer ); if(count) { |