X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=include%2Fsound%2Fgus.h;h=887b03cce1af635d1cfe6b68f502cf6dc656789d;hp=6cd0a22527f4c829263b84b8ab098915ea603d51;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hpb=c449269f45c2cdf53af08c8d0af37472f66539d9 diff --git a/include/sound/gus.h b/include/sound/gus.h index 6cd0a2252..887b03cce 100644 --- a/include/sound/gus.h +++ b/include/sound/gus.h @@ -684,9 +684,9 @@ extern int snd_engine_instrument_register_ask(unsigned short mode); #endif /* gus_dram.c */ -int snd_gus_dram_write(snd_gus_card_t *gus, char *ptr, +int snd_gus_dram_write(snd_gus_card_t *gus, char __user *ptr, unsigned int addr, unsigned int size); -int snd_gus_dram_read(snd_gus_card_t *gus, char *ptr, +int snd_gus_dram_read(snd_gus_card_t *gus, char __user *ptr, unsigned int addr, unsigned int size, int rom); #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) @@ -699,21 +699,21 @@ void snd_gf1_simple_init(snd_gus_voice_t *voice); /* gus_instr.c */ int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave, - char *data, long len, int atomic); + char __user *data, long len, int atomic); int snd_gus_iwffff_get_sample(void *private_data, iwffff_wave_t *wave, - char *data, long len, int atomic); + char __user *data, long len, int atomic); int snd_gus_iwffff_remove_sample(void *private_data, iwffff_wave_t *wave, int atomic); int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave, - char *data, long len, int atomic); + char __user *data, long len, int atomic); int snd_gus_gf1_get_sample(void *private_data, gf1_wave_t *wave, - char *data, long len, int atomic); + char __user *data, long len, int atomic); int snd_gus_gf1_remove_sample(void *private_data, gf1_wave_t *wave, int atomic); int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr, - char *data, long len, int atomic); + char __user *data, long len, int atomic); int snd_gus_simple_get_sample(void *private_data, simple_instrument_t *instr, - char *data, long len, int atomic); + char __user *data, long len, int atomic); int snd_gus_simple_remove_sample(void *private_data, simple_instrument_t *instr, int atomic);