diff options
-rw-r--r-- | drivers/media/common/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/common/saa7146_fops.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa5246a.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa5249.c | 1 | ||||
-rw-r--r-- | drivers/media/video/vino.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index 1a04db4552da..f33e5d973413 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig | |||
@@ -4,7 +4,6 @@ config VIDEO_SAA7146 | |||
4 | 4 | ||
5 | config VIDEO_SAA7146_VV | 5 | config VIDEO_SAA7146_VV |
6 | tristate | 6 | tristate |
7 | select VIDEO_V4L2 | ||
8 | select VIDEO_BUF | 7 | select VIDEO_BUF |
9 | select VIDEO_VIDEOBUF | 8 | select VIDEO_VIDEOBUF |
10 | select VIDEO_SAA7146 | 9 | select VIDEO_SAA7146 |
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 0027acc5b8e9..d867a6a9e430 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -455,7 +455,6 @@ static void vv_callback(struct saa7146_dev *dev, unsigned long status) | |||
455 | 455 | ||
456 | static struct video_device device_template = | 456 | static struct video_device device_template = |
457 | { | 457 | { |
458 | .hardware = VID_HARDWARE_SAA7146, | ||
459 | .fops = &video_fops, | 458 | .fops = &video_fops, |
460 | .minor = -1, | 459 | .minor = -1, |
461 | }; | 460 | }; |
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 59a187272c83..77bb940a1a4f 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
@@ -830,7 +830,6 @@ static struct video_device saa_template = | |||
830 | .owner = THIS_MODULE, | 830 | .owner = THIS_MODULE, |
831 | .name = IF_NAME, | 831 | .name = IF_NAME, |
832 | .type = VID_TYPE_TELETEXT, | 832 | .type = VID_TYPE_TELETEXT, |
833 | .hardware = VID_HARDWARE_SAA5249, | ||
834 | .fops = &saa_fops, | 833 | .fops = &saa_fops, |
835 | .release = video_device_release, | 834 | .release = video_device_release, |
836 | .minor = -1, | 835 | .minor = -1, |
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 19a8d65699f8..bb3fb4387f65 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
@@ -713,7 +713,6 @@ static struct video_device saa_template = | |||
713 | .owner = THIS_MODULE, | 713 | .owner = THIS_MODULE, |
714 | .name = IF_NAME, | 714 | .name = IF_NAME, |
715 | .type = VID_TYPE_TELETEXT, /*| VID_TYPE_TUNER ?? */ | 715 | .type = VID_TYPE_TELETEXT, /*| VID_TYPE_TUNER ?? */ |
716 | .hardware = VID_HARDWARE_SAA5249, | ||
717 | .fops = &saa_fops, | 716 | .fops = &saa_fops, |
718 | }; | 717 | }; |
719 | 718 | ||
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 | }; |