git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
m68k
/
mac
/
macboing.c
diff --git
a/arch/m68k/mac/macboing.c
b/arch/m68k/mac/macboing.c
index
44c5cd2
..
8f06408
100644
(file)
--- 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 );
/*
* our timer to start/continue/stop the bell
*/
/*
* our timer to start/continue/stop the bell
*/
-static struct timer_list mac_sound_timer =
- TIMER_INITIALIZER(mac_nosound, 0, 0);
+static DEFINE_TIMER(mac_sound_timer, mac_nosound, 0, 0);
/*
* Sort of initialize the sound chip (called from mac_mksound on the first
/*
* Sort of initialize the sound chip (called from mac_mksound on the first