aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
parentf74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2 (diff)
downloadkernel_samsung_crespo-58c66df3e38ffb1d59cc5162bb9e07c859288034.zip
kernel_samsung_crespo-58c66df3e38ffb1d59cc5162bb9e07c859288034.tar.gz
kernel_samsung_crespo-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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/videodev.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 8a7aead..f11efbe 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 */
/*