diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:35:50 +0100 |
| commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
| tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /include/sound | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
| download | linux-3.10-e0d2054fd3cf167395390dc1758644486c782707.tar.gz linux-3.10-e0d2054fd3cf167395390dc1758644486c782707.tar.bz2 linux-3.10-e0d2054fd3cf167395390dc1758644486c782707.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 2 | ||||
| -rw-r--r-- | include/sound/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index e4f60076e6c..8904b1900d7 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -450,7 +450,7 @@ struct snd_pcm_notify { extern const struct file_operations snd_pcm_f_ops[2]; -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); int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count); diff --git a/include/sound/version.h b/include/sound/version.h index 2b48237e23b..a7e74e23ad2 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h */ -#define CONFIG_SND_VERSION "1.0.18a" +#define CONFIG_SND_VERSION "1.0.19" #define CONFIG_SND_DATE "" |