aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-27 05:38:48 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:17:11 -0500
commit58c66df3e38ffb1d59cc5162bb9e07c859288034 (patch)
tree006bd2d86fb5d1f4003da42be99863490fdac222 /drivers/media
parentf74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2 (diff)
[media] Remove VIDEO_V4L1 Kconfig option
There's no sense on keeping VIDEO_V4L1 Kconfig option just because of two deprecated drivers moved to staging scheduled to die on 2.6.39. Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/Kconfig14
-rw-r--r--drivers/media/video/Kconfig5
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 9ea1a6d70f0a..147c92b9b4f6 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -40,20 +40,6 @@ config VIDEO_V4L2_COMMON
40 depends on (I2C || I2C=n) && VIDEO_DEV 40 depends on (I2C || I2C=n) && VIDEO_DEV
41 default (I2C || I2C=n) && VIDEO_DEV 41 default (I2C || I2C=n) && VIDEO_DEV
42 42
43config VIDEO_ALLOW_V4L1
44 bool "Enable Video For Linux API 1 (DEPRECATED)"
45 depends on VIDEO_DEV && VIDEO_V4L2_COMMON
46 default VIDEO_DEV && VIDEO_V4L2_COMMON
47 ---help---
48 Enables drivers based on the legacy V4L1 API.
49
50 This api were developed to be used at Kernel 2.2 and 2.4, but
51 lacks support for several video standards. There are several
52 drivers at kernel that still depends on it.
53
54 If you are unsure as to whether this is required, answer Y.
55
56
57# 43#
58# DVB Core 44# DVB Core
59# 45#
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index b3bf04368bf2..78b8c5de1f6b 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -7,11 +7,6 @@ config VIDEO_V4L2
7 depends on VIDEO_DEV && VIDEO_V4L2_COMMON 7 depends on VIDEO_DEV && VIDEO_V4L2_COMMON
8 default VIDEO_DEV && VIDEO_V4L2_COMMON 8 default VIDEO_DEV && VIDEO_V4L2_COMMON
9 9
10config VIDEO_V4L1
11 tristate
12 depends on VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
13 default VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
14
15config VIDEOBUF_GEN 10config VIDEOBUF_GEN
16 tristate 11 tristate
17 12