Merge branch 'topic/oss' into for-linus

[linux-2.6-block.git] / sound / core / oss / pcm_oss.c

diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index d35d61b3292ced461a1aa63f0f755a072324e840..d9c96353121a567b53f040dc1b87207aac40cac4 100644 (file)
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2841,7 +2841,8 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
                                   struct snd_info_buffer *buffer)
 {
        struct snd_pcm_str *pstr = entry->private_data;
-       char line[128], str[32], task_name[32], *ptr;
+       char line[128], str[32], task_name[32];
+       const char *ptr;
        int idx1;
        struct snd_pcm_oss_setup *setup, *setup1, template;