From 1eb8111a8073c25e4f4e386ffcdc650cd9877b80 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 8 Aug 2006 15:48:07 -0300
Subject: [PATCH] --- yaml --- r: 37362 b: refs/heads/master c:
 b23056ef373c27a3bd089b40f45f4bc74674e71c h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/common/Kconfig        | 1 -
 trunk/drivers/media/common/saa7146_fops.c | 1 -
 trunk/drivers/media/video/saa5246a.c      | 1 -
 trunk/drivers/media/video/saa5249.c       | 1 -
 trunk/drivers/media/video/vino.c          | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9aabc006e4bf..bf997ea4ce79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 704fd4a5672a5447a7f177838236eb13232be3c1
+refs/heads/master: b23056ef373c27a3bd089b40f45f4bc74674e71c
diff --git a/trunk/drivers/media/common/Kconfig b/trunk/drivers/media/common/Kconfig
index 1a04db4552da..f33e5d973413 100644
--- a/trunk/drivers/media/common/Kconfig
+++ b/trunk/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/trunk/drivers/media/common/saa7146_fops.c b/trunk/drivers/media/common/saa7146_fops.c
index 0027acc5b8e9..d867a6a9e430 100644
--- a/trunk/drivers/media/common/saa7146_fops.c
+++ b/trunk/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/trunk/drivers/media/video/saa5246a.c b/trunk/drivers/media/video/saa5246a.c
index 59a187272c83..77bb940a1a4f 100644
--- a/trunk/drivers/media/video/saa5246a.c
+++ b/trunk/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/trunk/drivers/media/video/saa5249.c b/trunk/drivers/media/video/saa5249.c
index 19a8d65699f8..bb3fb4387f65 100644
--- a/trunk/drivers/media/video/saa5249.c
+++ b/trunk/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/trunk/drivers/media/video/vino.c b/trunk/drivers/media/video/vino.c
index 268e69fdefc6..d1e04f7c530b 100644
--- a/trunk/drivers/media/video/vino.c
+++ b/trunk/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,
 };