diff --git a/[refs] b/[refs] index aa1eac899957..b7ee9d552fcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cade9f8a9cf1cd41f6f9e8850c6a0465a21248c3 +refs/heads/master: e6161653094f14b1add10efe3493a2e526fe9538 diff --git a/trunk/include/sound/pcm.h b/trunk/include/sound/pcm.h index 40c5a6fa6bcd..ee0e887e49d4 100644 --- a/trunk/include/sound/pcm.h +++ b/trunk/include/sound/pcm.h @@ -451,7 +451,7 @@ struct snd_pcm_notify { extern const struct file_operations snd_pcm_f_ops[2]; -int snd_pcm_new(struct snd_card *card, char *id, int device, +int snd_pcm_new(struct snd_card *card, const char *id, int device, int playback_count, int capture_count, struct snd_pcm **rpcm); int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count); diff --git a/trunk/sound/core/pcm.c b/trunk/sound/core/pcm.c index 192a433a2403..583453e2355c 100644 --- a/trunk/sound/core/pcm.c +++ b/trunk/sound/core/pcm.c @@ -692,7 +692,7 @@ EXPORT_SYMBOL(snd_pcm_new_stream); * * Returns zero if successful, or a negative error code on failure. */ -int snd_pcm_new(struct snd_card *card, char *id, int device, +int snd_pcm_new(struct snd_card *card, const char *id, int device, int playback_count, int capture_count, struct snd_pcm ** rpcm) {