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/gspca | |
| 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/gspca')
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index 3e17f92fb..e06d6bb83 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -36,6 +36,7 @@ #include <linux/uaccess.h> #endif #include <linux/jiffies.h> +#include <media/v4l2-ioctl.h> #include "gspca.h" @@ -1746,7 +1747,7 @@ int gspca_dev_probe(struct usb_interface *intf, /* init video stuff */ memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template); - gspca_dev->vdev.dev = &dev->dev; + gspca_dev->vdev.parent = &dev->dev; memcpy(&gspca_dev->fops, &dev_fops, sizeof gspca_dev->fops); gspca_dev->vdev.fops = &gspca_dev->fops; gspca_dev->fops.owner = module; /* module protection */ |