Merge branch 'linus' into perf/urgent, to synchronize with upstream

[linux.git] / sound / core / pcm_local.h

diff --git a/sound/core/pcm_local.h b/sound/core/pcm_local.h
index 384efd0029849c3abc6742ad9834003881d7346b..17a1a5d870980bb34945b5a807434cb6b3a84ac2 100644 (file)
--- a/sound/core/pcm_local.h
+++ b/sound/core/pcm_local.h
@@ -20,9 +20,6 @@ void snd_interval_muldivk(const struct snd_interval *a,
 void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
                          const struct snd_interval *b, struct snd_interval *c);
 
-int snd_pcm_hw_constraints_init(struct snd_pcm_substream *substream);
-int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream);
-
 int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime,
                               snd_pcm_hw_param_t var, u_int32_t mask);