diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
| commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
| tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /include/sound/pcm.h | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound/pcm.h')
| -rw-r--r-- | include/sound/pcm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index e4f60076e6c4..8904b1900d7f 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -450,7 +450,7 @@ struct snd_pcm_notify { | |||
| 450 | 450 | ||
| 451 | extern const struct file_operations snd_pcm_f_ops[2]; | 451 | extern const struct file_operations snd_pcm_f_ops[2]; |
| 452 | 452 | ||
| 453 | int snd_pcm_new(struct snd_card *card, char *id, int device, | 453 | int snd_pcm_new(struct snd_card *card, const char *id, int device, |
| 454 | int playback_count, int capture_count, | 454 | int playback_count, int capture_count, |
| 455 | struct snd_pcm **rpcm); | 455 | struct snd_pcm **rpcm); |
| 456 | int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count); | 456 | int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count); |