summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-27 13:38:48 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 13:17:11 +0300
commit58c66df3e38ffb1d59cc5162bb9e07c859288034 (patch)
tree006bd2d86fb5d1f4003da42be99863490fdac222 /drivers/media
parentf74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2 (diff)
downloadlinux-58c66df3e38ffb1d59cc5162bb9e07c859288034.tar.xz
[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
depends on (I2C || I2C=n) && VIDEO_DEV
default (I2C || I2C=n) && VIDEO_DEV
-config VIDEO_ALLOW_V4L1
- bool "Enable Video For Linux API 1 (DEPRECATED)"
- depends on VIDEO_DEV && VIDEO_V4L2_COMMON
- default VIDEO_DEV && VIDEO_V4L2_COMMON
- ---help---
- Enables drivers based on the legacy V4L1 API.
-
- This api were developed to be used at Kernel 2.2 and 2.4, but
- lacks support for several video standards. There are several
- drivers at kernel that still depends on it.
-
- If you are unsure as to whether this is required, answer Y.
-
-
#
# DVB Core
#
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
depends on VIDEO_DEV && VIDEO_V4L2_COMMON
default VIDEO_DEV && VIDEO_V4L2_COMMON
-config VIDEO_V4L1
- tristate
- depends on VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
- default VIDEO_DEV && VIDEO_V4L2_COMMON && VIDEO_ALLOW_V4L1
-
config VIDEOBUF_GEN
tristate