diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-19 05:34:07 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-19 05:34:07 +0400 |
| commit | 2879a927bb7a3cf91ae3906a5e59215f9c17dd75 (patch) | |
| tree | 870bdd1bd530a3d5d2abd10539700446b2878188 /drivers/media/video/stradis.c | |
| parent | 7e7b43892b87b6be259479ef4de14029dcb4012f (diff) | |
| parent | 20211e4d344729f4d4c93da37a590fc1c3a1fd9b (diff) | |
| download | linux-2879a927bb7a3cf91ae3906a5e59215f9c17dd75.tar.xz | |
Merge branch 'x86/oprofile' into oprofile
Diffstat (limited to 'drivers/media/video/stradis.c')
| -rw-r--r-- | drivers/media/video/stradis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index c109511f21ea..276bded06ab3 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c @@ -43,6 +43,7 @@ #include <linux/vmalloc.h> #include <linux/videodev.h> #include <media/v4l2-common.h> +#include <media/v4l2-ioctl.h> #include "saa7146.h" #include "saa7146reg.h" @@ -1918,7 +1919,6 @@ static const struct file_operations saa_fops = { /* template for video_device-structure */ static struct video_device saa_template = { .name = "SAA7146A", - .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY, .fops = &saa_fops, .minor = -1, }; |