aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/control.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-03-16 17:38:41 +0100
committerTakashi Iwai <tiwai@suse.de>2011-03-16 17:38:41 +0100
commit27b92d4ff2be2359a21ff4acde5b63563ff720e2 (patch)
tree49691b22fe1318aa68d5ebdff74795f004f0cf8f /include/sound/control.h
parent5de0ee574be8f6922a6c33f2fbc7e9b130a2f626 (diff)
parente58a8947b0264ec1f43ce5deef563b72acf1284f (diff)
downloadkernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.zip
kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.gz
kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.bz2
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'include/sound/control.h')
-rw-r--r--include/sound/control.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/control.h b/include/sound/control.h
index 7715e6f..e67db28 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -115,6 +115,8 @@ 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_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,
+ int active);
struct snd_kcontrol *snd_ctl_find_numid(struct snd_card * card, unsigned int numid);
struct snd_kcontrol *snd_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id);