summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-12-27 07:38:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 08:17:11 -0200
commit58c66df3e38ffb1d59cc5162bb9e07c859288034 (patch)
tree006bd2d86fb5d1f4003da42be99863490fdac222
parentf74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2 (diff)
downloadlinux-58c66df3e38ffb1d59cc5162bb9e07c859288034.tar.bz2
[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>
-rw-r--r--drivers/media/Kconfig14
-rw-r--r--drivers/media/video/Kconfig5
-rw-r--r--drivers/staging/se401/Kconfig2
-rw-r--r--drivers/staging/usbvideo/Kconfig2
-rw-r--r--include/linux/videodev.h4
5 files changed, 2 insertions, 25 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
diff --git a/drivers/staging/se401/Kconfig b/drivers/staging/se401/Kconfig
index 586fc0432a4b..ee7313e66c79 100644
--- a/drivers/staging/se401/Kconfig
+++ b/drivers/staging/se401/Kconfig
@@ -1,6 +1,6 @@
config USB_SE401
tristate "USB SE401 Camera support (DEPRECATED)"
- depends on VIDEO_V4L1
+ depends on VIDEO_DEV && VIDEO_V4L2_COMMON
---help---
Say Y here if you want to connect this type of camera to your
computer's USB port. See <file:Documentation/video4linux/se401.txt>
diff --git a/drivers/staging/usbvideo/Kconfig b/drivers/staging/usbvideo/Kconfig
index aae863e8a902..d9fc867d09eb 100644
--- a/drivers/staging/usbvideo/Kconfig
+++ b/drivers/staging/usbvideo/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
config USB_VICAM
tristate "USB 3com HomeConnect (aka vicam) support (DEPRECATED)"
- depends on VIDEO_V4L1 && EXPERIMENTAL
+ depends on VIDEO_DEV && VIDEO_V4L2_COMMON
select VIDEO_USBVIDEO
---help---
Say Y here if you have 3com homeconnect camera (vicam).
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 8a7aead76a38..f11efbef1c05 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -16,8 +16,6 @@
#include <linux/ioctl.h>
#include <linux/videodev2.h>
-#if defined(CONFIG_VIDEO_V4L1) || defined(CONFIG_VIDEO_V4L1_MODULE) || !defined(__KERNEL__)
-
#define VID_TYPE_CAPTURE 1 /* Can capture */
#define VID_TYPE_TUNER 2 /* Can tune */
#define VID_TYPE_TELETEXT 4 /* Does teletext */
@@ -311,8 +309,6 @@ struct video_code
#define VID_PLAY_RESET 13
#define VID_PLAY_END_MARK 14
-#endif /* CONFIG_VIDEO_V4L1 */
-
#endif /* __LINUX_VIDEODEV_H */
/*