diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:29 +0200 |
| commit | f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de (patch) | |
| tree | d6ea8cc44a9d55d29d38605165a09cf69ff9a536 /include/sound/pcm.h | |
| parent | 61eab000f3536f080eab43fd5eed3fd817ded76e (diff) | |
| parent | 59b1f084abd8690ffe68c67758ad08bbcb7d1af0 (diff) | |
| download | linux-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.tar.gz linux-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.tar.bz2 linux-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.zip | |
Merge branch 'topic/misc' into for-next
Generic updates for sound 3.6
Diffstat (limited to 'include/sound/pcm.h')
| -rw-r--r-- | include/sound/pcm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 0d1112815be3..e91e6047ca6f 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -810,7 +810,7 @@ int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_pa int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, unsigned int cond, snd_pcm_hw_param_t var, - struct snd_pcm_hw_constraint_list *l); + const struct snd_pcm_hw_constraint_list *l); int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, unsigned int cond, snd_pcm_hw_param_t var, @@ -893,6 +893,7 @@ extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates; int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime); unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate); +unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit); static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream, struct snd_dma_buffer *bufp) |