patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / sound / oss / midi_synth.h

diff --git a/sound/oss/midi_synth.h b/sound/oss/midi_synth.h
index fcaf7d5..6bc9d00 100644 (file)
--- a/sound/oss/midi_synth.h
+++ b/sound/oss/midi_synth.h
@@ -1,5 +1,5 @@
 int midi_synth_ioctl (int dev,
-           unsigned int cmd, caddr_t arg);
+           unsigned int cmd, void __user * arg);
 int midi_synth_kill_note (int dev, int channel, int note, int velocity);
 int midi_synth_set_instr (int dev, int channel, int instr_no);
 int midi_synth_start_note (int dev, int channel, int note, int volume);
@@ -7,7 +7,7 @@ void midi_synth_reset (int dev);
 int midi_synth_open (int dev, int mode);
 void midi_synth_close (int dev);
 void midi_synth_hw_control (int dev, unsigned char *event);
-int midi_synth_load_patch (int dev, int format, const char * addr,
+int midi_synth_load_patch (int dev, int format, const char __user * addr,
                 int offs, int count, int pmgr_flag);
 void midi_synth_panning (int dev, int channel, int pressure);
 void midi_synth_aftertouch (int dev, int channel, int pressure);