diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-14 08:01:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-14 08:01:03 -0300 |
| commit | 77a54391749b0582d1b897410f89f29a97d65c0e (patch) | |
| tree | c90f69a1d41a47472e2d865e427d739b1fb272b0 /linux/drivers/media/video/v4l2-dev.c | |
| parent | 7fd7d21d543d90ecf1086f9c5909bd4c01cf69ae (diff) | |
| parent | ae60401740721009d74b54741f77637b64907bdc (diff) | |
| download | mediapointer-dvb-s2-77a54391749b0582d1b897410f89f29a97d65c0e.tar.gz mediapointer-dvb-s2-77a54391749b0582d1b897410f89f29a97d65c0e.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cxusb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/v4l2-dev.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-dev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index 398376a40..d97320091 100644 --- a/linux/drivers/media/video/v4l2-dev.c +++ b/linux/drivers/media/video/v4l2-dev.c @@ -356,10 +356,8 @@ int video_register_device_index(struct video_device *vfd, int type, int nr, /* sysfs class */ memset(&vfd->dev, 0x00, sizeof(vfd->dev)); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) vfd->dev.class = &video_class; vfd->dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); -#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) if (vfd->parent) vfd->dev.dev = vfd->parent; |