summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb/dvb-usb.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-13 10:08:17 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-26 09:52:26 -0300
commita3dfc6d925ca1bbd1a228253acb93f08657bad25 (patch)
treebb9d146b49bfa1fb5704cff6059c6bc0842d309d /drivers/media/usb/dvb-usb/dvb-usb.h
parent496ccf92b9b5342b995a711829de76c320a916b6 (diff)
[media] dvb-usb: create one media_dev per adapter
Instead of assuming just one adapter, change the code to store one media controller per adapter. This works fine for dvb-usb, as, on all drivers here, it is not possible to write a media graph that would mix resources between the two different adapters. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb/dvb-usb.h')
-rw-r--r--drivers/media/usb/dvb-usb/dvb-usb.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h
index 8d37f1e5ff23..ce4c4e3b58bb 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb.h
+++ b/drivers/media/usb/dvb-usb/dvb-usb.h
@@ -453,10 +453,6 @@ struct dvb_usb_device {
struct module *owner;
void *priv;
-
-#ifdef CONFIG_MEDIA_CONTROLLER_DVB
- struct media_device *media_dev;
-#endif
};
extern int dvb_usb_device_init(struct usb_interface *,