vserver 1.9.5.x5

[linux-2.6.git] / include / sound / ainstr_simple.h

diff --git a/include/sound/ainstr_simple.h b/include/sound/ainstr_simple.h
index bef1f99..40824b4 100644 (file)
--- a/include/sound/ainstr_simple.h
+++ b/include/sound/ainstr_simple.h
@@ -134,15 +134,13 @@ typedef struct simple_xinstrument {
 
 #include "seq_instr.h"
 
-extern char *snd_seq_simple_id;
-
 typedef struct {
        void *private_data;
        int (*info)(void *private_data, simple_instrument_info_t *info);
        int (*put_sample)(void *private_data, simple_instrument_t *instr,
-                         char *data, long len, int atomic);
+                         char __user *data, long len, int atomic);
        int (*get_sample)(void *private_data, simple_instrument_t *instr,
-                         char *data, long len, int atomic);
+                         char __user *data, long len, int atomic);
        int (*remove_sample)(void *private_data, simple_instrument_t *instr,
                             int atomic);
        void (*notify)(void *private_data, snd_seq_kinstr_t *instr, int what);