summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-dvb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 21:04:48 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 21:04:48 -0200
commit2a81a59d7d85fc2656c9cab0e56c9f819e2dc19e (patch)
tree9af686d50b122b3eb040ec07cd88d67c2776bed2 /linux/drivers/media/video/cx18/cx18-dvb.c
parent8031abacbe51fa4062ff4bf1a34751b6a39460eb (diff)
parent7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9 (diff)
downloadmediapointer-dvb-s2-2a81a59d7d85fc2656c9cab0e56c9f819e2dc19e.tar.gz
mediapointer-dvb-s2-2a81a59d7d85fc2656c9cab0e56c9f819e2dc19e.tar.bz2
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-dvb.c')
-rw-r--r--linux/drivers/media/video/cx18/cx18-dvb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-dvb.c b/linux/drivers/media/video/cx18/cx18-dvb.c
index bd5e6f3fd..3b86f57cd 100644
--- a/linux/drivers/media/video/cx18/cx18-dvb.c
+++ b/linux/drivers/media/video/cx18/cx18-dvb.c
@@ -167,7 +167,7 @@ int cx18_dvb_register(struct cx18_stream *stream)
ret = dvb_register_adapter(&dvb->dvb_adapter,
CX18_DRIVER_NAME,
- THIS_MODULE, &cx->dev->dev, adapter_nr);
+ THIS_MODULE, &cx->pci_dev->dev, adapter_nr);
if (ret < 0)
goto err_out;