Subject: [PATCH] SGI VINO Kconfig patch

From: [email-masked]
Date: Thu, 1 Sep 2005 20:22:49 +0300 (EEST)

Please apply this patch to make the config for VINO a bit nicer :)

Mikael Nousiainen

diff -urN b/drivers/media/video/Kconfig c/drivers/media/video/Kconfig
--- b/drivers/media/video/Kconfig	2005-08-10 17:37:15.000000000 +0300
+++ c/drivers/media/video/Kconfig	2005-09-01 20:07:35.000000000 +0300
@@ -153,12 +153,38 @@
 	  If in doubt, say N.

 config VIDEO_VINO
-	tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
-	depends on VIDEO_DEV && I2C && SGI_IP22 && EXPERIMENTAL
+	tristate "SGI VINO Video For Linux"
+	depends on VIDEO_DEV && I2C && SGI_IP22
 	select I2C_ALGO_SGI
 	help
-	  Say Y here to build in support for the Vino video input system found
-	  on SGI Indy machines.
+	  Say Y here to enable support for the VINO video input system found
+	  on SGI Indy machines. To use the driver you also need to select
+	  at least one of the video input modules: SAA7191 and IndyCam.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called vino.
+
+config VIDEO_SAA7191
+	tristate "Philips SAA7191 video decoder support"
+	depends on VIDEO_VINO
+	default y
+	help
+	  Say Y here to enable support for the Philips SAA7191 digital
+	  multi-standard video decoder. This driver provides access
+	  to the Composite and S-Video inputs of SGI Indy.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called saa7191.
+
+config VIDEO_INDYCAM
+	tristate "SGI IndyCam support"
+	depends on VIDEO_VINO
+	default y
+	help
+	  Say Y here to enable support for the SGI IndyCam digital camera.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called indycam.

 config VIDEO_STRADIS
 	tristate "Stradis 4:2:2 MPEG-2 video driver  (EXPERIMENTAL)"
diff -urN b/drivers/media/video/Makefile c/drivers/media/video/Makefile
--- b/drivers/media/video/Makefile	2005-08-16 16:32:52.000000000 +0300
+++ c/drivers/media/video/Makefile	2005-09-01 19:58:00.000000000 +0300
@@ -29,7 +29,9 @@
 obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o
 obj-$(CONFIG_VIDEO_PMS) += pms.o
 obj-$(CONFIG_VIDEO_PLANB) += planb.o
-obj-$(CONFIG_VIDEO_VINO) += vino.o saa7191.o indycam.o
+obj-$(CONFIG_VIDEO_VINO) += vino.o
+obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
+obj-$(CONFIG_VIDEO_INDYCAM) += indycam.o
 obj-$(CONFIG_VIDEO_STRADIS) += stradis.o
 obj-$(CONFIG_VIDEO_CPIA) += cpia.o
 obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o