summaryrefslogtreecommitdiff
path: root/sound/core/info.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-09-10 15:32:51 +0200
committerTakashi Iwai <tiwai@suse.de>2009-09-10 15:32:51 +0200
commit6a0f4021469727675b83d85ac91d106bfae0e2c3 (patch)
treec6d7ffd99db592f4b7c294d1a5a7b54284012673 /sound/core/info.c
parentf9892a52e2405b4c5fa205d4f18ad292cb7e40bb (diff)
parentb888d1ce82ebd2bafecf64c765754968e78b4228 (diff)
downloadlwn-6a0f4021469727675b83d85ac91d106bfae0e2c3.tar.gz
lwn-6a0f4021469727675b83d85ac91d106bfae0e2c3.zip
Merge branch 'topic/dummy' into for-linus
* topic/dummy: ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128 ALSA: dummy - Add debug proc file ALSA: Add const prefix to proc helper functions ALSA: Re-export snd_pcm_format_name() function ALSA: dummy - Fake buffer allocations ALSA: dummy - Fix the timer calculation in systimer mode ALSA: dummy - Add more description ALSA: dummy - Better jiffies handling ALSA: dummy - Support high-res timer mode
Diffstat (limited to 'sound/core/info.c')
-rw-r--r--sound/core/info.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/info.c b/sound/core/info.c
index 3d1f5137420a..d749a0d394a7 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -106,7 +106,7 @@ static int resize_info_buffer(struct snd_info_buffer *buffer,
*
* Returns the size of output string.
*/
-int snd_iprintf(struct snd_info_buffer *buffer, char *fmt,...)
+int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...)
{
va_list args;
int len, res;
@@ -725,7 +725,7 @@ EXPORT_SYMBOL(snd_info_get_line);
* Returns the updated pointer of the original string so that
* it can be used for the next call.
*/
-char *snd_info_get_str(char *dest, char *src, int len)
+const char *snd_info_get_str(char *dest, const char *src, int len)
{
int c;