Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 15 insertions, 1 deletions

diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index 26c636c5c93a..ae1a14dcfe82 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -24,7 +24,16 @@ struct usb_mixer_interface {
         u8 xonar_u1_status;
 };
 
-#define MAX_CHANNELS    10      /* max logical channels */
+#define MAX_CHANNELS    16      /* max logical channels */
+
+enum {
+        USB_MIXER_BOOLEAN,
+        USB_MIXER_INV_BOOLEAN,
+        USB_MIXER_S8,
+        USB_MIXER_U8,
+        USB_MIXER_S16,
+        USB_MIXER_U16,
+};
 
 struct usb_mixer_elem_info {
         struct usb_mixer_interface *mixer;
@@ -52,5 +61,10 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);
 
 int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
                                 int request, int validx, int value_set);
+void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer);
+int snd_usb_mixer_activate(struct usb_mixer_interface *mixer);
+
+int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer,
+                              struct snd_kcontrol *kctl);
 
 #endif /* __USBMIXER_H */