diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 12:01:29 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 12:01:29 +0400 |
| commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
| tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /include/sound/control.h | |
| parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
| parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) | |
| download | linux-02e5fbf622aabf68bdc02282a17a3aeed054237a.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'include/sound/control.h')
| -rw-r--r-- | include/sound/control.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index 404acb859cee..1a94a216ed99 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -113,6 +113,7 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new * kcontrolnew, v void snd_ctl_free_one(struct snd_kcontrol * kcontrol); int snd_ctl_add(struct snd_card * card, struct snd_kcontrol * kcontrol); int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol); +int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol, bool add_on_replace); int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id); int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id); int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id, |