V4L/DVB (3774): Create V4L1 config options

V4L1 API is depreciated and should be removed soon from kernel. This patch
adds two new options, one to disable V4L1 drivers, and another to disable
V4L1 compat module. This way, it would be easy to check what still depends
on V4L1 stuff, allowing also to test if app works fine with V4L2 only support.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

17 files changed, 118 insertions, 71 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index fffc711c260c..344d83aae3ec 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -8,22 +8,54 @@ config VIDEO_DEV
         tristate "Video For Linux"
         ---help---
           Support for audio/video capture and overlay devices and FM radio
-          cards. The exact capabilities of each device vary. User tools for
-          this are available from
-          <ftp://ftp.uk.linux.org/pub/linux/video4linux/>.
+          cards. The exact capabilities of each device vary.
 
           This kernel includes support for the new Video for Linux Two API,
           (V4L2) as well as the original system. Drivers and applications
           need to be rewritten to use V4L2, but drivers for popular cards
           and applications for most video capture functions already exist.
 
-          Documentation for the original API is included in the file
-          <file:Documentation/video4linux/API.html>.  Documentation for V4L2 is
-          available on the web at <http://bytesex.org/v4l/>.
+          Additional info and docs are available on the web at
+          <http://linuxtv.org>
+
+          Documentation for V4L2 is also available on the web at
+          <http://bytesex.org/v4l/>.
 
           To compile this driver as a module, choose M here: the
           module will be called videodev.
 
+config VIDEO_V4L1
+        boolean "Enable Video For Linux API 1 (DEPRECATED)"
+        depends on VIDEO_DEV
+        select VIDEO_V4L1_COMPAT
+        default y
+        ---help---
+          Enables a compatibility API used by most V4L2 devices to allow
+          its usage with legacy applications that supports only V4L1 api.
+
+          If you are unsure as to whether this is required, answer Y.
+
+config VIDEO_V4L1_COMPAT
+        boolean "Enable Video For Linux API 1 compatible Layer"
+        depends on VIDEO_DEV
+        default y
+        ---help---
+          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.
+
+          Documentation for the original API is included in the file
+          <Documentation/video4linux/API.html>.
+
+          User tools for this are available from
+          <ftp://ftp.uk.linux.org/pub/linux/video4linux/>.
+
+          If you are unsure as to whether this is required, answer Y.
+
+config VIDEO_V4L2
+        tristate
+        default y
+
 source "drivers/media/video/Kconfig"
 
 source "drivers/media/radio/Kconfig"
@@ -65,4 +97,3 @@ config USB_DABUSB
           module will be called dabusb.
 
 endmenu
-
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 6a901a0268e1..9c45b983e0de 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -4,6 +4,7 @@ config VIDEO_SAA7146
 
 config VIDEO_SAA7146_VV
         tristate
+        select VIDEO_V4L2
         select VIDEO_BUF
         select VIDEO_VIDEOBUF
         select VIDEO_SAA7146
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 5b2aadb8385c..c26e23291511 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -1,8 +1,7 @@
 config DVB_AV7110
         tristate "AV7110 cards"
-        depends on DVB_CORE && PCI
+        depends on DVB_CORE && PCI && VIDEO_V4L1
         select FW_LOADER
-        select VIDEO_DEV
         select VIDEO_SAA7146_VV
         select DVB_VES1820
         select DVB_VES1X93
@@ -59,7 +58,7 @@ config DVB_AV7110_OSD
 
 config DVB_BUDGET
         tristate "Budget cards"
-        depends on DVB_CORE && PCI
+        depends on DVB_CORE && PCI && VIDEO_V4L1
         select VIDEO_SAA7146
         select DVB_STV0299
         select DVB_VES1X93
@@ -80,7 +79,7 @@ config DVB_BUDGET
 
 config DVB_BUDGET_CI
         tristate "Budget cards with onboard CI connector"
-        depends on DVB_CORE && PCI
+        depends on DVB_CORE && PCI && VIDEO_V4L1
         select VIDEO_SAA7146
         select DVB_STV0297
         select DVB_STV0299
@@ -100,8 +99,7 @@ config DVB_BUDGET_CI
 
 config DVB_BUDGET_AV
         tristate "Budget cards with analog video inputs"
-        depends on DVB_CORE && PCI
-        select VIDEO_DEV
+        depends on DVB_CORE && PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
         select DVB_STV0299
         select DVB_TDA1004X
@@ -119,7 +117,7 @@ config DVB_BUDGET_AV
 
 config DVB_BUDGET_PATCH
         tristate "AV7110 cards with Budget Patch"
-        depends on DVB_CORE && DVB_BUDGET
+        depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
         select DVB_AV7110
         select DVB_STV0299
         select DVB_VES1X93
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index d318be383de6..3fff75763693 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -7,7 +7,7 @@ menu "Radio Adapters"
 
 config RADIO_CADET
         tristate "ADS Cadet AM/FM Tuner"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have one of these AM/FM radio cards, and then
           fill in the port address below.
@@ -25,7 +25,7 @@ config RADIO_CADET
 
 config RADIO_RTRACK
         tristate "AIMSlab RadioTrack (aka RadioReveal) support"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have one of these FM radio cards, and then fill
           in the port address below.
@@ -59,7 +59,7 @@ config RADIO_RTRACK_PORT
 
 config RADIO_RTRACK2
         tristate "AIMSlab RadioTrack II support"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have this FM radio card, and then fill in the
           port address below.
@@ -82,7 +82,7 @@ config RADIO_RTRACK2_PORT
 
 config RADIO_AZTECH
         tristate "Aztech/Packard Bell Radio"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have one of these FM radio cards, and then fill
           in the port address below.
@@ -106,7 +106,7 @@ config RADIO_AZTECH_PORT
 
 config RADIO_GEMTEK
         tristate "GemTek Radio Card support"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have this FM radio card, and then fill in the
           port address below.
@@ -131,7 +131,7 @@ config RADIO_GEMTEK_PORT
 
 config RADIO_GEMTEK_PCI
         tristate "GemTek PCI Radio Card support"
-        depends on VIDEO_DEV && PCI
+        depends on VIDEO_V4L1 && PCI
         ---help---
           Choose Y here if you have this PCI FM radio card.
 
@@ -145,7 +145,7 @@ config RADIO_GEMTEK_PCI
 
 config RADIO_MAXIRADIO
         tristate "Guillemot MAXI Radio FM 2000 radio"
-        depends on VIDEO_DEV && PCI
+        depends on VIDEO_V4L1 && PCI
         ---help---
           Choose Y here if you have this radio card.  This card may also be
           found as Gemtek PCI FM.
@@ -160,7 +160,7 @@ config RADIO_MAXIRADIO
 
 config RADIO_MAESTRO
         tristate "Maestro on board radio"
-        depends on VIDEO_DEV
+        depends on VIDEO_V4L1
         ---help---
           Say Y here to directly support the on-board radio tuner on the
           Maestro 2 or 2E sound card.
@@ -175,7 +175,7 @@ config RADIO_MAESTRO
 
 config RADIO_MIROPCM20
         tristate "miroSOUND PCM20 radio"
-        depends on ISA && VIDEO_DEV && SOUND_ACI_MIXER
+        depends on ISA && VIDEO_V4L1 && SOUND_ACI_MIXER
         ---help---
           Choose Y here if you have this FM radio card. You also need to say Y
           to "ACI mixer (miroSOUND PCM1-pro/PCM12/PCM20 radio)" (in "Sound")
@@ -208,7 +208,7 @@ config RADIO_MIROPCM20_RDS
 
 config RADIO_SF16FMI
         tristate "SF16FMI Radio"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have one of these FM radio cards.  If you
           compile the driver into the kernel and your card is not PnP one, you
@@ -225,7 +225,7 @@ config RADIO_SF16FMI
 
 config RADIO_SF16FMR2
         tristate "SF16FMR2 Radio"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have one of these FM radio cards.
 
@@ -239,7 +239,7 @@ config RADIO_SF16FMR2
 
 config RADIO_TERRATEC
         tristate "TerraTec ActiveRadio ISA Standalone"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have this FM radio card, and then fill in the
           port address below. (TODO)
@@ -268,7 +268,7 @@ config RADIO_TERRATEC_PORT
 
 config RADIO_TRUST
         tristate "Trust FM radio card"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         help
           This is a driver for the Trust FM radio cards. Say Y if you have
           such a card and want to use it under Linux.
@@ -286,7 +286,7 @@ config RADIO_TRUST_PORT
 
 config RADIO_TYPHOON
         tristate "Typhoon Radio (a.k.a. EcoRadio)"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have one of these FM radio cards, and then fill
           in the port address and the frequency used for muting below.
@@ -330,7 +330,7 @@ config RADIO_TYPHOON_MUTEFREQ
 
 config RADIO_ZOLTRIX
         tristate "Zoltrix Radio"
-        depends on ISA && VIDEO_DEV
+        depends on ISA && VIDEO_V4L1
         ---help---
           Choose Y here if you have one of these FM radio cards, and then fill
           in the port address below.
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 85888a8a93c9..bff9d8f51dab 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -2,10 +2,10 @@
 # Multimedia Video device configuration
 #
 
-menu "Video For Linux"
+menu "Video Capture Adapters"
         depends on VIDEO_DEV
 
-comment "Video Adapters"
+comment "Video Capture Adapters"
 
 config VIDEO_ADV_DEBUG
         bool "Enable advanced debug functionality"
@@ -20,7 +20,7 @@ source "drivers/media/video/bt8xx/Kconfig"
 
 config VIDEO_SAA6588
         tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
-        depends on VIDEO_DEV && I2C && VIDEO_BT848
+        depends on I2C && VIDEO_BT848
 
         help
           Support for  Radio Data System (RDS) decoder. This allows seeing
@@ -32,7 +32,7 @@ config VIDEO_SAA6588
 
 config VIDEO_PMS
         tristate "Mediavision Pro Movie Studio Video For Linux"
-        depends on VIDEO_DEV && ISA
+        depends on ISA && VIDEO_V4L1
         help
           Say Y if you have such a thing.
 
@@ -41,7 +41,7 @@ config VIDEO_PMS
 
 config VIDEO_PLANB
         tristate "PlanB Video-In on PowerMac"
-        depends on PPC_PMAC && VIDEO_DEV && BROKEN
+        depends on PPC_PMAC && VIDEO_V4L1 && BROKEN
         help
           PlanB is the V4L driver for the PowerMac 7x00/8x00 series video
           input hardware. If you want to experiment with this, say Y.
@@ -52,7 +52,7 @@ config VIDEO_PLANB
 
 config VIDEO_BWQCAM
         tristate "Quickcam BW Video For Linux"
-        depends on VIDEO_DEV && PARPORT
+        depends on PARPORT && VIDEO_V4L1
         help
           Say Y have if you the black and white version of the QuickCam
           camera. See the next option for the color version.
@@ -62,7 +62,7 @@ config VIDEO_BWQCAM
 
 config VIDEO_CQCAM
         tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && VIDEO_DEV && PARPORT
+        depends on EXPERIMENTAL && PARPORT && VIDEO_V4L1
         help
           This is the video4linux driver for the colour version of the
           Connectix QuickCam.  If you have one of these cameras, say Y here,
@@ -73,7 +73,7 @@ config VIDEO_CQCAM
 
 config VIDEO_W9966
         tristate "W9966CF Webcam (FlyCam Supra and others) Video For Linux"
-        depends on PARPORT_1284 && VIDEO_DEV && PARPORT
+        depends on PARPORT_1284 && PARPORT && VIDEO_V4L1
         help
           Video4linux driver for Winbond's w9966 based Webcams.
           Currently tested with the LifeView FlyCam Supra.
@@ -86,7 +86,7 @@ config VIDEO_W9966
 
 config VIDEO_CPIA
         tristate "CPiA Video For Linux"
-        depends on VIDEO_DEV
+        depends on VIDEO_V4L1
         ---help---
           This is the video4linux driver for cameras based on Vision's CPiA
           (Colour Processor Interface ASIC), such as the Creative Labs Video
@@ -123,7 +123,7 @@ source "drivers/media/video/cpia2/Kconfig"
 
 config VIDEO_SAA5246A
         tristate "SAA5246A, SAA5281 Teletext processor"
-        depends on VIDEO_DEV && I2C
+        depends on I2C && VIDEO_V4L1
         help
           Support for I2C bus based teletext using the SAA5246A or SAA5281
           chip. Useful only if you live in Europe.
@@ -150,7 +150,7 @@ config TUNER_3036
 
 config VIDEO_VINO
         tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
-        depends on VIDEO_DEV && I2C && SGI_IP22 && EXPERIMENTAL
+        depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L1
         select I2C_ALGO_SGI
         help
           Say Y here to build in support for the Vino video input system found
@@ -158,7 +158,7 @@ config VIDEO_VINO
 
 config VIDEO_STRADIS
         tristate "Stradis 4:2:2 MPEG-2 video driver  (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && VIDEO_DEV && PCI
+        depends on EXPERIMENTAL && PCI && VIDEO_V4L1
         help
           Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video
           driver for PCI.  There is a product page at
@@ -166,7 +166,7 @@ config VIDEO_STRADIS
 
 config VIDEO_ZORAN
         tristate "Zoran ZR36057/36067 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C_ALGOBIT
+        depends on PCI && I2C_ALGOBIT && VIDEO_V4L1
         help
           Say Y for support for MJPEG capture cards based on the Zoran
           36057/36067 PCI controller chipset. This includes the Iomega
@@ -214,7 +214,7 @@ config VIDEO_ZORAN_LML33R10
 
 config VIDEO_ZR36120
         tristate "Zoran ZR36120/36125 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C && BROKEN
+        depends on PCI && I2C && VIDEO_V4L1 && BROKEN
         help
           Support for ZR36120/ZR36125 based frame grabber/overlay boards.
           This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV,
@@ -226,7 +226,7 @@ config VIDEO_ZR36120
 
 config VIDEO_MEYE
         tristate "Sony Vaio Picturebook Motion Eye Video For Linux"
-        depends on VIDEO_DEV && PCI && SONYPI
+        depends on PCI && SONYPI && VIDEO_V4L1
         ---help---
           This is the video4linux driver for the Motion Eye camera found
           in the Vaio Picturebook laptops. Please read the material in
@@ -242,7 +242,7 @@ source "drivers/media/video/saa7134/Kconfig"
 
 config VIDEO_MXB
         tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
         select VIDEO_TUNER
         ---help---
@@ -254,8 +254,9 @@ config VIDEO_MXB
 
 config VIDEO_DPC
         tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select VIDEO_V4L2
         ---help---
           This is a video4linux driver for the 'dpc7146 demonstration
           board' by Philips-Semiconductors. It's the reference design
@@ -268,8 +269,9 @@ config VIDEO_DPC
 
 config VIDEO_HEXIUM_ORION
         tristate "Hexium HV-PCI6 and Orion frame grabber"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select VIDEO_V4L2
         ---help---
           This is a video4linux driver for the Hexium HV-PCI6 and
           Orion frame grabber cards by Hexium.
@@ -279,8 +281,9 @@ config VIDEO_HEXIUM_ORION
 
 config VIDEO_HEXIUM_GEMINI
         tristate "Hexium Gemini frame grabber"
-        depends on VIDEO_DEV && PCI
+        depends on PCI && VIDEO_V4L1
         select VIDEO_SAA7146_VV
+        select VIDEO_V4L2
         ---help---
           This is a video4linux driver for the Hexium Gemini frame
           grabber card by Hexium. Please note that the Gemini Dual
@@ -293,7 +296,7 @@ source "drivers/media/video/cx88/Kconfig"
 
 config VIDEO_OVCAMCHIP
         tristate "OmniVision Camera Chip support"
-        depends on VIDEO_DEV && I2C
+        depends on I2C && VIDEO_V4L1
         ---help---
           Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
           This driver is intended to be used with the ov511 and w9968cf USB
@@ -304,7 +307,7 @@ config VIDEO_OVCAMCHIP
 
 config VIDEO_M32R_AR
         tristate "AR devices"
-        depends on M32R
+        depends on M32R && VIDEO_V4L1
         ---help---
           This is a video4linux driver for the Renesas AR (Artificial Retina)
           camera module.
@@ -365,17 +368,17 @@ config VIDEO_WM8739
 source "drivers/media/video/cx25840/Kconfig"
 
 config VIDEO_SAA711X
-        tristate "Philips SAA7113/4/5 video decoders"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)"
+        depends on VIDEO_V4L1 && I2C && EXPERIMENTAL
         ---help---
-          Support for the Philips SAA7113/4/5 video decoders.
+          Old support for the Philips SAA7113/4 video decoders.
 
           To compile this driver as a module, choose M here: the
           module will be called saa7115.
 
 config VIDEO_SAA7127
         tristate "Philips SAA7127/9 digital video encoders"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         ---help---
           Support for the Philips SAA7127/9 digital video encoders.
 
@@ -384,7 +387,7 @@ config VIDEO_SAA7127
 
 config VIDEO_UPD64031A
         tristate "NEC Electronics uPD64031A Ghost Reduction"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         ---help---
           Support for the NEC Electronics uPD64031A Ghost Reduction
           video chip. It is most often found in NTSC TV cards made for
@@ -396,7 +399,7 @@ config VIDEO_UPD64031A
 
 config VIDEO_UPD64083
         tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
-        depends on VIDEO_DEV && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && I2C && EXPERIMENTAL
         ---help---
           Support for the NEC Electronics uPD64083 3-Dimensional Y/C
           separation video chip. It is used to improve the quality of
@@ -418,7 +421,7 @@ source "drivers/media/video/em28xx/Kconfig"
 
 config USB_DSBR
         tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        depends on USB && VIDEO_V4L1 && EXPERIMENTAL
         ---help---
           Say Y here if you want to connect this type of radio to your
           computer's USB port. Note that the audio is not digital, and
@@ -434,7 +437,7 @@ source "drivers/media/video/et61x251/Kconfig"
 
 config USB_OV511
         tristate "USB OV511 Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. See <file:Documentation/video4linux/ov511.txt>
@@ -445,7 +448,7 @@ config USB_OV511
 
 config USB_SE401
         tristate "USB SE401 Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---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>
@@ -458,7 +461,7 @@ source "drivers/media/video/sn9c102/Kconfig"
 
 config USB_STV680
         tristate "USB STV680 (Pencam) Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want to connect this type of camera to your
           computer's USB port. This includes the Pencam line of cameras.
@@ -470,7 +473,7 @@ config USB_STV680
 
 config USB_W9968CF
         tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-        depends on USB && VIDEO_DEV && I2C
+        depends on USB && VIDEO_V4L1 && I2C
         select VIDEO_OVCAMCHIP
         ---help---
           Say Y here if you want support for cameras based on OV681 or
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index b3ea2d63db9b..11b06dac347b 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -10,7 +10,8 @@ tuner-objs	:=	tuner-core.o tuner-types.o tuner-simple.o \
 
 msp3400-objs    :=      msp3400-driver.o msp3400-kthreads.o
 
-obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o
+obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o
+obj-$(CONFIG_VIDEO_V4L1_COMPAT) += v4l1-compat.o
 
 obj-$(CONFIG_VIDEO_BT848) += bt8xx/
 obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 085477c12612..153f6a4a96c9 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_BT848
         tristate "BT848 Video For Linux"
-        depends on VIDEO_DEV && PCI && I2C
+        depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 72a417b31745..694d1d80ff3f 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -35,8 +35,10 @@
 #include "cx88.h"
 #include <media/v4l2-common.h>
 
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
 #include <linux/videodev.h>
+#endif
 
 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
index 5a793ae7cc23..dfb15bfb83dc 100644
--- a/drivers/media/video/em28xx/Kconfig
+++ b/drivers/media/video/em28xx/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_EM28XX
         tristate "Empia EM2800/2820/2840 USB video capture support"
-        depends on VIDEO_DEV && USB && I2C
+        depends on VIDEO_V4L1 && USB && I2C
         select VIDEO_BUF
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig
index 6c43a90c6569..c6bff705688d 100644
--- a/drivers/media/video/et61x251/Kconfig
+++ b/drivers/media/video/et61x251/Kconfig
@@ -1,6 +1,6 @@
 config USB_ET61X251
         tristate "USB ET61X[12]51 PC Camera Controller support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on Etoms ET61X151
           or ET61X251 PC Camera Controllers.
diff --git a/drivers/media/video/pwc/Kconfig b/drivers/media/video/pwc/Kconfig
index 86376556f108..53cbc950f95c 100644
--- a/drivers/media/video/pwc/Kconfig
+++ b/drivers/media/video/pwc/Kconfig
@@ -1,6 +1,6 @@
 config USB_PWC
         tristate "USB Philips Cameras"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y or M here if you want to use one of these Philips & OEM
           webcams:
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index aeef80f88a6b..e4156ec9c6d7 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -31,8 +31,10 @@
 #include "saa7134.h"
 #include <media/v4l2-common.h>
 
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
 #include <linux/videodev.h>
+#endif
 
 /* ------------------------------------------------------------------ */
 
diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig
index 55f2bc11964b..cf552e6b8ecf 100644
--- a/drivers/media/video/sn9c102/Kconfig
+++ b/drivers/media/video/sn9c102/Kconfig
@@ -1,6 +1,6 @@
 config USB_SN9C102
         tristate "USB SN9C10x PC Camera Controller support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on SONiX SN9C101,
           SN9C102 or SN9C103 PC Camera Controllers.
diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
index 08a5d20bb2c0..39269a2c5635 100644
--- a/drivers/media/video/usbvideo/Kconfig
+++ b/drivers/media/video/usbvideo/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_USBVIDEO
 
 config USB_VICAM
         tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        depends on USB && VIDEO_V4L1 && EXPERIMENTAL
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you have 3com homeconnect camera (vicam).
@@ -13,7 +13,7 @@ config USB_VICAM
 
 config USB_IBMCAM
         tristate "USB IBM (Xirlink) C-it Camera support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you want to connect a IBM "C-It" camera, also known as
@@ -28,7 +28,7 @@ config USB_IBMCAM
 
 config USB_KONICAWC
         tristate "USB Konica Webcam support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         select VIDEO_USBVIDEO
         ---help---
           Say Y here if you want support for webcams based on a Konica
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 5e813404d068..9e42224b46b6 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -26,6 +26,10 @@
 #include <linux/random.h>
 #include <linux/version.h>
 #include <linux/videodev2.h>
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
+/* Include V4L1 specific functions. Should be removed soon */
+#include <linux/videodev.h>
+#endif
 #include <linux/interrupt.h>
 #include <media/video-buf.h>
 #include <media/v4l2-common.h>
diff --git a/drivers/media/video/zc0301/Kconfig b/drivers/media/video/zc0301/Kconfig
index c3bf886b80cd..115833e4f4dd 100644
--- a/drivers/media/video/zc0301/Kconfig
+++ b/drivers/media/video/zc0301/Kconfig
@@ -1,6 +1,6 @@
 config USB_ZC0301
         tristate "USB ZC0301 Image Processor and Control Chip support"
-        depends on USB && VIDEO_DEV
+        depends on USB && VIDEO_V4L1
         ---help---
           Say Y here if you want support for cameras based on the ZC0301
           Image Processor and Control Chip.
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index d7670ec1ec1e..ad7fa9c86c10 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1141,8 +1141,13 @@ extern char *v4l2_type_names[];
 /*  Compatibility layer interface  --  v4l1-compat module */
 typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg);
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
                                int cmd, void *arg, v4l2_kioctl driver_ioctl);
+#else
+#define v4l_compat_translate_ioctl(inode,file,cmd,arg,ioctl) -EINVAL
+#endif
 
 /* 32 Bits compatibility layer for 64 bits processors */
 extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,