aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-12-02 10:40:33 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-16 20:21:44 -0500
commit427ae153c65ad7a08288d86baf99000569627d03 (patch)
tree52119858c582478c8737366abbb308af5c95a9f6
parentea2e813e8cc3492c951b9895724fd47187e04a6f (diff)
[media] bq/c-qcam, w9966, pms: move to staging in preparation for removal
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. In addition, cheaper and vastly better hardware is available today. 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. Let's be honest, the age of parallel port webcams and ISA video capture boards is really gone. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/Kconfig1
-rw-r--r--drivers/media/Makefile2
-rw-r--r--drivers/staging/media/Kconfig2
-rw-r--r--drivers/staging/media/Makefile1
-rw-r--r--drivers/staging/media/parport/Kconfig (renamed from drivers/media/parport/Kconfig)24
-rw-r--r--drivers/staging/media/parport/Makefile (renamed from drivers/media/parport/Makefile)0
-rw-r--r--drivers/staging/media/parport/bw-qcam.c (renamed from drivers/media/parport/bw-qcam.c)0
-rw-r--r--drivers/staging/media/parport/c-qcam.c (renamed from drivers/media/parport/c-qcam.c)0
-rw-r--r--drivers/staging/media/parport/pms.c (renamed from drivers/media/parport/pms.c)0
-rw-r--r--drivers/staging/media/parport/w9966.c (renamed from drivers/media/parport/w9966.c)0
10 files changed, 24 insertions, 6 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 3c89fcbc621e..49cd30870e0d 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -160,7 +160,6 @@ source "drivers/media/usb/Kconfig"
160source "drivers/media/pci/Kconfig" 160source "drivers/media/pci/Kconfig"
161source "drivers/media/platform/Kconfig" 161source "drivers/media/platform/Kconfig"
162source "drivers/media/mmc/Kconfig" 162source "drivers/media/mmc/Kconfig"
163source "drivers/media/parport/Kconfig"
164source "drivers/media/radio/Kconfig" 163source "drivers/media/radio/Kconfig"
165 164
166comment "Supported FireWire (IEEE 1394) Adapters" 165comment "Supported FireWire (IEEE 1394) Adapters"
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 620f275a45c9..e608bbce0c35 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -28,6 +28,6 @@ obj-y += rc/
28# Finally, merge the drivers that require the core 28# Finally, merge the drivers that require the core
29# 29#
30 30
31obj-y += common/ platform/ pci/ usb/ mmc/ firewire/ parport/ 31obj-y += common/ platform/ pci/ usb/ mmc/ firewire/
32obj-$(CONFIG_VIDEO_DEV) += radio/ 32obj-$(CONFIG_VIDEO_DEV) += radio/
33 33
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 209b265f5f7a..2a054a99d433 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -35,6 +35,8 @@ source "drivers/staging/media/mn88473/Kconfig"
35 35
36source "drivers/staging/media/omap4iss/Kconfig" 36source "drivers/staging/media/omap4iss/Kconfig"
37 37
38source "drivers/staging/media/parport/Kconfig"
39
38source "drivers/staging/media/vino/Kconfig" 40source "drivers/staging/media/vino/Kconfig"
39 41
40# Keep LIRC at the end, as it has sub-menus 42# Keep LIRC at the end, as it has sub-menus
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index a0eec73b5174..412b28408398 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
6obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ 6obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
7obj-$(CONFIG_DVB_MN88472) += mn88472/ 7obj-$(CONFIG_DVB_MN88472) += mn88472/
8obj-$(CONFIG_DVB_MN88473) += mn88473/ 8obj-$(CONFIG_DVB_MN88473) += mn88473/
9obj-y += parport/
9obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/ 10obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/
10obj-y += vino/ 11obj-y += vino/
11 12
diff --git a/drivers/media/parport/Kconfig b/drivers/staging/media/parport/Kconfig
index 948c981d9f05..15974efdba1d 100644
--- a/drivers/media/parport/Kconfig
+++ b/drivers/staging/media/parport/Kconfig
@@ -7,18 +7,22 @@ menuconfig MEDIA_PARPORT_SUPPORT
7 7
8if MEDIA_PARPORT_SUPPORT 8if MEDIA_PARPORT_SUPPORT
9config VIDEO_BWQCAM 9config VIDEO_BWQCAM
10 tristate "Quickcam BW Video For Linux" 10 tristate "Quickcam BW Video For Linux (Deprecated)"
11 depends on PARPORT && VIDEO_V4L2 11 depends on PARPORT && VIDEO_V4L2
12 select VIDEOBUF2_VMALLOC 12 select VIDEOBUF2_VMALLOC
13 help 13 help
14 Say Y have if you the black and white version of the QuickCam 14 Say Y have if you the black and white version of the QuickCam
15 camera. See the next option for the color version. 15 camera. See the next option for the color version.
16 16
17 This driver is deprecated and will be removed soon. If you have
18 hardware for this and you want to work on this driver, then contact
19 the linux-media mailinglist.
20
17 To compile this driver as a module, choose M here: the 21 To compile this driver as a module, choose M here: the
18 module will be called bw-qcam. 22 module will be called bw-qcam.
19 23
20config VIDEO_CQCAM 24config VIDEO_CQCAM
21 tristate "QuickCam Colour Video For Linux" 25 tristate "QuickCam Colour Video For Linux (Deprecated)"
22 depends on PARPORT && VIDEO_V4L2 26 depends on PARPORT && VIDEO_V4L2
23 help 27 help
24 This is the video4linux driver for the colour version of the 28 This is the video4linux driver for the colour version of the
@@ -28,18 +32,26 @@ config VIDEO_CQCAM
28 as a module (c-qcam). 32 as a module (c-qcam).
29 Read <file:Documentation/video4linux/CQcam.txt> for more information. 33 Read <file:Documentation/video4linux/CQcam.txt> for more information.
30 34
35 This driver is deprecated and will be removed soon. If you have
36 hardware for this and you want to work on this driver, then contact
37 the linux-media mailinglist.
38
31config VIDEO_PMS 39config VIDEO_PMS
32 tristate "Mediavision Pro Movie Studio Video For Linux" 40 tristate "Mediavision Pro Movie Studio Video For Linux (Deprecated)"
33 depends on ISA && VIDEO_V4L2 41 depends on ISA && VIDEO_V4L2
34 help 42 help
35 Say Y if you have the ISA Mediavision Pro Movie Studio 43 Say Y if you have the ISA Mediavision Pro Movie Studio
36 capture card. 44 capture card.
37 45
46 This driver is deprecated and will be removed soon. If you have
47 hardware for this and you want to work on this driver, then contact
48 the linux-media mailinglist.
49
38 To compile this driver as a module, choose M here: the 50 To compile this driver as a module, choose M here: the
39 module will be called pms. 51 module will be called pms.
40 52
41config VIDEO_W9966 53config VIDEO_W9966
42 tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux" 54 tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux (Deprecated)"
43 depends on PARPORT_1284 && PARPORT && VIDEO_V4L2 55 depends on PARPORT_1284 && PARPORT && VIDEO_V4L2
44 help 56 help
45 Video4linux driver for Winbond's w9966 based Webcams. 57 Video4linux driver for Winbond's w9966 based Webcams.
@@ -50,4 +62,8 @@ config VIDEO_W9966
50 62
51 Check out <file:Documentation/video4linux/w9966.txt> for more 63 Check out <file:Documentation/video4linux/w9966.txt> for more
52 information. 64 information.
65
66 This driver is deprecated and will be removed soon. If you have
67 hardware for this and you want to work on this driver, then contact
68 the linux-media mailinglist.
53endif 69endif
diff --git a/drivers/media/parport/Makefile b/drivers/staging/media/parport/Makefile
index 4eea06d7af5b..4eea06d7af5b 100644
--- a/drivers/media/parport/Makefile
+++ b/drivers/staging/media/parport/Makefile
diff --git a/drivers/media/parport/bw-qcam.c b/drivers/staging/media/parport/bw-qcam.c
index 67b9da1dc43f..67b9da1dc43f 100644
--- a/drivers/media/parport/bw-qcam.c
+++ b/drivers/staging/media/parport/bw-qcam.c
diff --git a/drivers/media/parport/c-qcam.c b/drivers/staging/media/parport/c-qcam.c
index b9010bd3ed3e..b9010bd3ed3e 100644
--- a/drivers/media/parport/c-qcam.c
+++ b/drivers/staging/media/parport/c-qcam.c
diff --git a/drivers/media/parport/pms.c b/drivers/staging/media/parport/pms.c
index e6b497528cea..e6b497528cea 100644
--- a/drivers/media/parport/pms.c
+++ b/drivers/staging/media/parport/pms.c
diff --git a/drivers/media/parport/w9966.c b/drivers/staging/media/parport/w9966.c
index f7502f3a6a3c..f7502f3a6a3c 100644
--- a/drivers/media/parport/w9966.c
+++ b/drivers/staging/media/parport/w9966.c