diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-21 18:19:59 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-21 18:19:59 +0200 |
| commit | a8230e32867ece54f05b4c884ce29dda9622321c (patch) | |
| tree | 7cfdce098c7a7286e973c07937c79798cc0ea13a /linux/drivers/media/video/cx23885 | |
| parent | 4bda3db2b690636bc88f5f292bc42172ed8bb20a (diff) | |
| parent | 83320b3d8bcf25a6a635588daa5e1547bb04bf22 (diff) | |
| download | mediapointer-dvb-s2-a8230e32867ece54f05b4c884ce29dda9622321c.tar.gz mediapointer-dvb-s2-a8230e32867ece54f05b4c884ce29dda9622321c.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/cx23885')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-417.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-video.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-417.c b/linux/drivers/media/video/cx23885/cx23885-417.c index ff1abdb0f..3c3563f73 100644 --- a/linux/drivers/media/video/cx23885/cx23885-417.c +++ b/linux/drivers/media/video/cx23885/cx23885-417.c @@ -32,6 +32,7 @@ #include <linux/device.h> #include <linux/firmware.h> #include <media/v4l2-common.h> +#include <media/v4l2-ioctl.h> #include <media/cx2341x.h> #include "cx23885.h" @@ -1774,7 +1775,7 @@ static struct video_device *cx23885_video_dev_alloc( vfd->minor = -1; snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, type, cx23885_boards[tsport->dev->board].name); - vfd->dev = &pci->dev; + vfd->parent = &pci->dev; vfd->release = video_device_release; return vfd; } diff --git a/linux/drivers/media/video/cx23885/cx23885-video.c b/linux/drivers/media/video/cx23885/cx23885-video.c index 6d0345935..b3d0902e1 100644 --- a/linux/drivers/media/video/cx23885/cx23885-video.c +++ b/linux/drivers/media/video/cx23885/cx23885-video.c @@ -34,6 +34,7 @@ #include "cx23885.h" #include <media/v4l2-common.h> +#include <media/v4l2-ioctl.h> #ifdef CONFIG_VIDEO_V4L1_COMPAT /* Include V4L1 specific functions. Should be removed soon */ @@ -361,7 +362,7 @@ struct video_device *cx23885_vdev_init(struct cx23885_dev *dev, return NULL; *vfd = *template; vfd->minor = -1; - vfd->dev = &pci->dev; + vfd->parent = &pci->dev; vfd->release = video_device_release; snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", dev->name, type, cx23885_boards[dev->board].name); |