Merge branch 'topic/misc' into for-linus

This commit is contained in:
Takashi Iwai
2009-03-24 00:35:50 +01:00
60 changed files with 491 additions and 277 deletions

View File

@@ -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);