Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

[deliverable/linux.git] / sound / usb / mixer.h

diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index f3789446ab9c49717e1dc0fa1c93e56162a08fbb..3417ef347e40432482b84de271a3bb98c8724297 100644 (file)
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -3,8 +3,6 @@
 
 #include <sound/info.h>
 
-struct media_mixer_ctl;
-
 struct usb_mixer_interface {
        struct snd_usb_audio *chip;
        struct usb_host_interface *hostif;
@@ -24,7 +22,6 @@ struct usb_mixer_interface {
        struct urb *rc_urb;
        struct usb_ctrlrequest *rc_setup_packet;
        u8 rc_buffer[6];
-       struct media_mixer_ctl *media_mixer_ctl;
 };
 
 #define MAX_CHANNELS   16      /* max logical channels */