Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / sound / usb / usbaudio.h

diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index b9faeca645fd0b15f96026208fbbb6f407bae910..0968a45c8925b5eede2ccf0f62970fac48ff74ea 100644 (file)
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -30,6 +30,9 @@
  *
  */
 
+struct media_device;
+struct media_intf_devnode;
+
 struct snd_usb_audio {
        int index;
        struct usb_device *dev;
@@ -66,6 +69,8 @@ struct snd_usb_audio {
                                         */
 
        struct usb_host_interface *ctrl_intf;   /* the audio control interface */
+       struct media_device *media_dev;
+       struct media_intf_devnode *ctl_intf_media_devnode;
 };
 
 #define usb_audio_err(chip, fmt, args...) \
@@ -117,6 +122,7 @@ struct snd_usb_audio_quirk {
        const char *profile_name;       /* override the card->longname */
        int16_t ifnum;
        uint16_t type;
+       bool shares_media_device;
        const void *data;
 };