diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:43 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:43 -0400 |
| commit | d22665702226e9c40bc331098559e3d55e7cd43d (patch) | |
| tree | 6e92734c9835dc9e064b20182624939f3486d28d /include/sound/pcm.h | |
| parent | 5cdf745ebae0f5bcf9b798d8fd5cb57add592cc1 (diff) | |
| parent | dde7ad8dee274763c8958769779aea8c993c950e (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound/pcm.h')
| -rw-r--r-- | include/sound/pcm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 249d98838d90..3e7fda6e8164 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -825,6 +825,8 @@ int snd_pcm_hw_constraint_step(struct snd_pcm_runtime *runtime, | |||
| 825 | int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime, | 825 | int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime, |
| 826 | unsigned int cond, | 826 | unsigned int cond, |
| 827 | snd_pcm_hw_param_t var); | 827 | snd_pcm_hw_param_t var); |
| 828 | int snd_pcm_hw_rule_noresample(struct snd_pcm_runtime *runtime, | ||
| 829 | unsigned int base_rate); | ||
| 828 | int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, | 830 | int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, |
| 829 | unsigned int cond, | 831 | unsigned int cond, |
| 830 | int var, | 832 | int var, |