lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] Remove VIDEO_V4L1 Kconfig option

Browse Source 
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>
This commit is contained in:
Mauro Carvalho Chehab
2010-12-27 07:38:48 -03:00
parent f74e3d0eea
commit 58c66df3e3
5 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/Kconfig
View File

@@ -40,20 +40,6 @@ config VIDEO_V4L2_COMMON
depends on (I2C || I2C=n) && VIDEO_DEV depends on (I2C || I2C=n) && VIDEO_DEV
default (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 # DVB Core
# #

5
drivers/media/video/Kconfig
View File

@@ -7,11 +7,6 @@ config VIDEO_V4L2
depends on VIDEO_DEV && VIDEO_V4L2_COMMON depends on VIDEO_DEV && VIDEO_V4L2_COMMON
default 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 config VIDEOBUF_GEN
tristate tristate

2
drivers/staging/se401/Kconfig
View File

@@ -1,6 +1,6 @@
config USB_SE401 config USB_SE401
tristate "USB SE401 Camera support (DEPRECATED)" tristate "USB SE401 Camera support (DEPRECATED)"
depends on VIDEO_V4L1 depends on VIDEO_DEV && VIDEO_V4L2_COMMON
---help--- ---help---
Say Y here if you want to connect this type of camera to your Say Y here if you want to connect this type of camera to your
computer's USB port. See <file:Documentation/video4linux/se401.txt> computer's USB port. See <file:Documentation/video4linux/se401.txt>

2
drivers/staging/usbvideo/Kconfig
View File

@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
config USB_VICAM config USB_VICAM
tristate "USB 3com HomeConnect (aka vicam) support (DEPRECATED)" tristate "USB 3com HomeConnect (aka vicam) support (DEPRECATED)"
depends on VIDEO_V4L1 && EXPERIMENTAL depends on VIDEO_DEV && VIDEO_V4L2_COMMON
select VIDEO_USBVIDEO select VIDEO_USBVIDEO
---help--- ---help---
Say Y here if you have 3com homeconnect camera (vicam). Say Y here if you have 3com homeconnect camera (vicam).

4
include/linux/videodev.h
View File

@@ -16,8 +16,6 @@
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/videodev2.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_CAPTURE 1 /* Can capture */
#define VID_TYPE_TUNER 2 /* Can tune */ #define VID_TYPE_TUNER 2 /* Can tune */
#define VID_TYPE_TELETEXT 4 /* Does teletext */ #define VID_TYPE_TELETEXT 4 /* Does teletext */
@@ -311,8 +309,6 @@ struct video_code
#define VID_PLAY_RESET 13 #define VID_PLAY_RESET 13
#define VID_PLAY_END_MARK 14 #define VID_PLAY_END_MARK 14
#endif /* CONFIG_VIDEO_V4L1 */
#endif /* __LINUX_VIDEODEV_H */ #endif /* __LINUX_VIDEODEV_H */
/* /*