diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 02:58:43 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 02:58:43 +0200 |
| commit | 4c4400504f6ada0cfed682fbe7e6c65efbda3952 (patch) | |
| tree | 5452eb39c76081fc871abdf1a38ccf3668f5cb4f /drivers/media/usb/cx231xx/cx231xx.h | |
| parent | d2eaa59000c7717e68a75cf2c106f056d2bc30b4 (diff) | |
| parent | 18922936dc2817488ebba985c5aaf3498f2ef96d (diff) | |
| download | op-kernel-dev-4c4400504f6ada0cfed682fbe7e6c65efbda3952.zip op-kernel-dev-4c4400504f6ada0cfed682fbe7e6c65efbda3952.tar.gz | |
Merge remote-tracking branch 'linuxtv/vsp1' into HEAD
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx.h')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h index ec6d3f5..69f6d20 100644 --- a/drivers/media/usb/cx231xx/cx231xx.h +++ b/drivers/media/usb/cx231xx/cx231xx.h @@ -281,7 +281,6 @@ enum cx231xx_itype { CX231XX_VMUX_CABLE, CX231XX_RADIO, CX231XX_VMUX_DVB, - CX231XX_VMUX_DEBUG }; enum cx231xx_v_input { @@ -663,6 +662,8 @@ struct cx231xx { #if defined(CONFIG_MEDIA_CONTROLLER) struct media_device *media_dev; struct media_pad video_pad, vbi_pad; + struct media_entity input_ent[MAX_CX231XX_INPUT]; + struct media_pad input_pad[MAX_CX231XX_INPUT]; #endif unsigned char eedata[256]; @@ -943,6 +944,7 @@ int cx231xx_register_extension(struct cx231xx_ops *dev); void cx231xx_unregister_extension(struct cx231xx_ops *dev); void cx231xx_init_extension(struct cx231xx *dev); void cx231xx_close_extension(struct cx231xx *dev); +void cx231xx_v4l2_create_entities(struct cx231xx *dev); int cx231xx_querycap(struct file *file, void *priv, struct v4l2_capability *cap); int cx231xx_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t); |
