diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
commit | 4741c336d27dec3ea68a35659abb8dc82b142388 (patch) | |
tree | a8576df82129354b77b0144c480c446ec7aba7b2 /include/sound | |
parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) |
Merge branch 'master'
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/pcm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 66b1f08b42b..df70e7592ab 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -367,7 +367,7 @@ struct snd_pcm_substream { struct snd_pcm_group self_group; /* fake group for non linked substream (with substream lock inside) */ struct snd_pcm_group *group; /* pointer to current group */ /* -- assigned files -- */ - struct snd_pcm_file *file; + void *file; struct file *ffile; void (*pcm_release)(struct snd_pcm_substream *); #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) @@ -898,7 +898,6 @@ ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples); const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format); int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int frames); snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian); -const char *snd_pcm_format_name(snd_pcm_format_t format); void snd_pcm_set_ops(struct snd_pcm * pcm, int direction, struct snd_pcm_ops *ops); void snd_pcm_set_sync(struct snd_pcm_substream *substream); |