Merge branch 'async' of macbook:git/btrfs-unstable

[mv-sheeva.git] / sound / usb / mixer.h

diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index 63101ae201cc23dbbf6d2f9af30b18d95c753bb4..26c636c5c93a3101a9a1a946bae52164734a2a89 100644 (file)
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -3,13 +3,15 @@
 
 struct usb_mixer_interface {
        struct snd_usb_audio *chip;
-       unsigned int ctrlif;
        struct list_head list;
        unsigned int ignore_ctl_error;
        struct urb *urb;
        /* array[MAX_ID_ELEMS], indexed by unit id */
        struct usb_mixer_elem_info **id_elems;
 
+       /* the usb audio specification version this interface complies to */
+       int protocol;
+
        /* Sound Blaster remote control stuff */
        const struct rc_config *rc_cfg;
        u32 rc_code;
@@ -31,6 +33,8 @@ struct usb_mixer_elem_info {
        unsigned int id;
        unsigned int control;   /* CS or ICN (high byte) */
        unsigned int cmask; /* channel mask bitmap: 0 = master */
+       unsigned int ch_readonly;
+       unsigned int master_readonly;
        int channels;
        int val_type;
        int min, max, res;