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 /sound/core/pcm.c | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/core/pcm.c')
| -rw-r--r-- | sound/core/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 37f567a68ef2..145931a9ff30 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c | |||
| @@ -691,7 +691,7 @@ EXPORT_SYMBOL(snd_pcm_new_stream); | |||
| 691 | * | 691 | * |
| 692 | * Returns zero if successful, or a negative error code on failure. | 692 | * Returns zero if successful, or a negative error code on failure. |
| 693 | */ | 693 | */ |
| 694 | int snd_pcm_new(struct snd_card *card, char *id, int device, | 694 | int snd_pcm_new(struct snd_card *card, const char *id, int device, |
| 695 | int playback_count, int capture_count, | 695 | int playback_count, int capture_count, |
| 696 | struct snd_pcm ** rpcm) | 696 | struct snd_pcm ** rpcm) |
| 697 | { | 697 | { |