diff options
author | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
commit | ae95d7126104591348d37aaf78c8325967e02386 (patch) | |
tree | 3270712f030549d77d4c55246d056e02b9def29d /sound/usb/card.h | |
parent | ipv6: fix inet6_lookup_listener() (diff) | |
parent | Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
download | linux-ae95d7126104591348d37aaf78c8325967e02386.tar.xz linux-ae95d7126104591348d37aaf78c8325967e02386.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'sound/usb/card.h')
-rw-r--r-- | sound/usb/card.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/usb/card.h b/sound/usb/card.h index 34a0898e2238..71778ca4b26a 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -105,8 +105,6 @@ struct snd_usb_endpoint { struct list_head list; }; -struct media_ctl; - struct snd_usb_substream { struct snd_usb_stream *stream; struct usb_device *dev; @@ -158,7 +156,6 @@ struct snd_usb_substream { } dsd_dop; bool trigger_tstamp_pending_update; /* trigger timestamp being updated from initial estimate */ - struct media_ctl *media_ctl; }; struct snd_usb_stream { |