From b23056ef373c27a3bd089b40f45f4bc74674e71c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 8 Aug 2006 15:48:07 -0300 Subject: V4L/DVB (4421): V4L2 Conversion: saa5246a, saa5249, vino, hexium_orion, hexium_gemini Just a few adjustments were required on those drivers to be V4L2 compliant. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/common/Kconfig | 1 - drivers/media/common/saa7146_fops.c | 1 - drivers/media/video/saa5246a.c | 1 - drivers/media/video/saa5249.c | 1 - drivers/media/video/vino.c | 1 - 5 files changed, 5 deletions(-) diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index 1a04db4552da9d..f33e5d973413c2 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig @@ -4,7 +4,6 @@ config VIDEO_SAA7146 config VIDEO_SAA7146_VV tristate - select VIDEO_V4L2 select VIDEO_BUF select VIDEO_VIDEOBUF select VIDEO_SAA7146 diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 0027acc5b8e988..d867a6a9e43065 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) static struct video_device device_template = { - .hardware = VID_HARDWARE_SAA7146, .fops = &video_fops, .minor = -1, }; diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 59a187272c8310..77bb940a1a4f41 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c @@ -830,7 +830,6 @@ static struct video_device saa_template = .owner = THIS_MODULE, .name = IF_NAME, .type = VID_TYPE_TELETEXT, - .hardware = VID_HARDWARE_SAA5249, .fops = &saa_fops, .release = video_device_release, .minor = -1, diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 19a8d65699f848..bb3fb4387f6500 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c @@ -713,7 +713,6 @@ static struct video_device saa_template = .owner = THIS_MODULE, .name = IF_NAME, .type = VID_TYPE_TELETEXT, /*| VID_TYPE_TUNER ?? */ - .hardware = VID_HARDWARE_SAA5249, .fops = &saa_fops, }; diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 268e69fdefc6f3..d1e04f7c530bbf 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -4404,7 +4404,6 @@ static struct video_device v4l_device_template = { .name = "NOT SET", //.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE | // VID_TYPE_CLIPPING | VID_TYPE_SCALES, VID_TYPE_OVERLAY - .hardware = VID_HARDWARE_VINO, .fops = &vino_fops, .minor = -1, }; -- cgit 1.2.3-korg