Merge branch 'topic/misc' into for-linus

[linux-2.6-omap-h63xx.git] / sound / core / pcm.c

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 37f567a68ef20d9b156a96901a3949f9c92d181a..145931a9ff302fa6b696a137b1036d8a125c540a 100644 (file)
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -691,7 +691,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)
 {