Merge tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / drivers / media / platform / Kconfig

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 5d8fd71fc454a269b9a62b56cf930a39b9a5fd0f..c7a1cf8a1b016fb968914a0d086a7ba12b0543d0 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -31,8 +31,6 @@ source "drivers/media/platform/davinci/Kconfig"
 
 source "drivers/media/platform/omap/Kconfig"
 
-source "drivers/media/platform/blackfin/Kconfig"
-
 config VIDEO_SH_VOU
        tristate "SuperH VOU video output driver"
        depends on MEDIA_CAMERA_SUPPORT
@@ -54,26 +52,6 @@ config VIDEO_VIU
          Say Y here if you want to enable VIU device on MPC5121e Rev2+.
          In doubt, say N.
 
-config VIDEO_M32R_AR
-       tristate "AR devices"
-       depends on VIDEO_V4L2
-       depends on M32R || COMPILE_TEST
-       ---help---
-         This is a video4linux driver for the Renesas AR (Artificial Retina)
-         camera module.
-
-config VIDEO_M32R_AR_M64278
-       tristate "AR device with color module M64278(VGA)"
-       depends on PLAT_M32700UT
-       select VIDEO_M32R_AR
-       ---help---
-         This is a video4linux driver for the Renesas AR (Artificial
-         Retina) with M64278E-800 camera module.
-         This module supports VGA(640x480 pixels) resolutions.
-
-         To compile this driver as a module, choose M here: the
-         module will be called arv.
-
 config VIDEO_MUX
        tristate "Video Multiplexer"
        select MULTIPLEXER