Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[deliverable/linux.git] / sound / oss / waveartist.c

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index b36ea47527e87f567cd5c97ee7b9d3297676f092..0b8d0de872732e618a55f6b26e9bec9935956d60 100644 (file)
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -1414,11 +1414,9 @@ attach_waveartist(struct address_info *hw, const struct waveartist_mixer_info *m
        else {
 #ifdef CONFIG_ARCH_NETWINDER
                if (machine_is_netwinder()) {
-                       init_timer(&vnc_timer);
-                       vnc_timer.function = vnc_slider_tick;
-                       vnc_timer.expires  = jiffies;
-                       vnc_timer.data     = nr_waveartist_devs;
-                       add_timer(&vnc_timer);
+                       setup_timer(&vnc_timer, vnc_slider_tick,
+                                   nr_waveartist_devs);
+                       mod_timer(&vnc_timer, jiffies);
 
                        vnc_configure_mixer(devc, 0);