diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /drivers/media/video/vino.c | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/media/video/vino.c')
| -rw-r--r-- | drivers/media/video/vino.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 268e69fdefc6..d1e04f7c530b 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
| @@ -4404,7 +4404,6 @@ static struct video_device v4l_device_template = { | |||
| 4404 | .name = "NOT SET", | 4404 | .name = "NOT SET", |
| 4405 | //.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | | 4405 | //.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | |
| 4406 | // VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY | 4406 | // VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY |
| 4407 | .hardware = VID_HARDWARE_VINO, | ||
| 4408 | .fops = &vino_fops, | 4407 | .fops = &vino_fops, |
| 4409 | .minor = -1, | 4408 | .minor = -1, |
| 4410 | }; | 4409 | }; |