[media] vino/saa7191: remove deprecated drivers

These drivers haven't been tested in a long, long time. The hardware is
ancient and hopelessly obsolete. These drivers also need to be converted
to newer media frameworks but due to the lack of hardware that's going
to be impossible.

So these drivers are a prime candidate for removal. If someone is
interested in working on these drivers to prevent their removal, then
please contact the linux-media mailinglist.

These drivers are already deprecated, so now remove them altogether.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 61e4acb..e633204 100644 (file)
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -35,8 +35,6 @@ source "drivers/staging/media/omap4iss/Kconfig"
 
 source "drivers/staging/media/parport/Kconfig"
 
-source "drivers/staging/media/vino/Kconfig"
-
 # Keep LIRC at the end, as it has sub-menus
 source "drivers/staging/media/lirc/Kconfig"
 

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index b7bda10..7edb567 100644 (file)
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -7,5 +7,3 @@ obj-$(CONFIG_VIDEO_OMAP4)       += omap4iss/
 obj-$(CONFIG_DVB_MN88472)       += mn88472/
 obj-$(CONFIG_DVB_MN88473)       += mn88473/
 obj-y                          += parport/
-obj-y                           += vino/
-

diff --git a/drivers/staging/media/vino/Kconfig b/drivers/staging/media/vino/Kconfig
deleted file mode 100644 (file)
index 03700da..0000000
--- a/drivers/staging/media/vino/Kconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-config VIDEO_VINO
-       tristate "SGI Vino Video For Linux (Deprecated)"
-       depends on I2C && SGI_IP22 && VIDEO_V4L2
-       select VIDEO_SAA7191 if MEDIA_SUBDRV_AUTOSELECT
-       help
-         Say Y here to build in support for the Vino video input system found
-         on SGI Indy machines.
-
-         This driver is deprecated and will be removed soon. If you have
-         hardware for this and you want to work on this driver, then contact
-         the linux-media mailinglist.
-
-config VIDEO_SAA7191
-       tristate "Philips SAA7191 video decoder (Deprecated)"
-       depends on VIDEO_V4L2 && I2C
-       ---help---
-         Support for the Philips SAA7191 video decoder.
-
-         This driver is deprecated and will be removed soon. If you have
-         hardware for this and you want to work on this driver, then contact
-         the linux-media mailinglist.
-
-         To compile this driver as a module, choose M here: the
-         module will be called saa7191.

diff --git a/drivers/staging/media/vino/Makefile b/drivers/staging/media/vino/Makefile
deleted file mode 100644 (file)
index 914c251..0000000
--- a/drivers/staging/media/vino/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-$(CONFIG_VIDEO_VINO) += indycam.o
-obj-$(CONFIG_VIDEO_VINO) += vino.o
-obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o

diff --cc drivers/staging/media/vino/indycam.c
Simple merge

diff --cc drivers/staging/media/vino/indycam.h
Simple merge

diff --cc drivers/staging/media/vino/saa7191.c
Simple merge

diff --cc drivers/staging/media/vino/saa7191.h
Simple merge

diff --cc drivers/staging/media/vino/vino.c
Simple merge

diff --cc drivers/staging/media/vino/vino.h
Simple merge