diff options
| author | Antoine Jacquet <royale@zerezo.com> | 2008-08-18 23:18:18 +0200 |
|---|---|---|
| committer | Antoine Jacquet <royale@zerezo.com> | 2008-08-18 23:18:18 +0200 |
| commit | e04f4692fb946b6480f856cb4986bacdc3a25f67 (patch) | |
| tree | 569253cfb9f1e2e656af7e27ccde5d1fd4361f81 /linux/drivers/media/video/v4l2-dev.c | |
| parent | 907cb68cd937317d682455610490e10b06389d22 (diff) | |
| parent | a499d8eb7179d0990c06b89c3362af960c7d9eef (diff) | |
| download | mediapointer-dvb-s2-e04f4692fb946b6480f856cb4986bacdc3a25f67.tar.gz mediapointer-dvb-s2-e04f4692fb946b6480f856cb4986bacdc3a25f67.tar.bz2 | |
merge: v4l-dvb
From: Antoine Jacquet <royale@zerezo.com>
Priority: normal
Signed-off-by: Antoine Jacquet <royale@zerezo.com>
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; |