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

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

diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index a7cf1007fbb07478fa6a81280174aa919ac8ec4e..26c636c5c93a3101a9a1a946bae52164734a2a89 100644 (file)
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -3,7 +3,6 @@
 
 struct usb_mixer_interface {
        struct snd_usb_audio *chip;
-       unsigned int ctrlif;
        struct list_head list;
        unsigned int ignore_ctl_error;
        struct urb *urb;