[media] Put the test devices together

Vivi is not that important to appear at the main menu, so move it
to its own submenu. Also, the mem2mem test device driver is
similar to vivi. So, put both at the same menu.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 30 insertions, 24 deletions

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 242468ba817e..d33e8e59a06b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -1,19 +1,5 @@
 if MEDIA_CAMERA_SUPPORT
 
-config VIDEO_VIVI
-        tristate "Virtual Video Driver"
-        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
-        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        select FONT_8x16
-        select VIDEOBUF2_VMALLOC
-        default n
-        ---help---
-          Enables a virtual video driver. This device shows a color bar
-          and a timestamp, as a real device would generate by using V4L2
-          api.
-          Say Y here if you want to test video apps or debug V4L devices.
-          In doubt, say N.
-
 #
 # Platform drivers
 #       All drivers here are currently for webcam support
@@ -142,16 +128,6 @@ menuconfig V4L_MEM2MEM_DRIVERS
 
 if V4L_MEM2MEM_DRIVERS
 
-config VIDEO_MEM2MEM_TESTDEV
-        tristate "Virtual test device for mem2mem framework"
-        depends on VIDEO_DEV && VIDEO_V4L2
-        select VIDEOBUF2_VMALLOC
-        select V4L2_MEM2MEM_DEV
-        default n
-        ---help---
-          This is a virtual test device for the memory-to-memory driver
-          framework.
-
 config VIDEO_CODA
         tristate "Chips&Media Coda multi-standard codec IP"
         depends on VIDEO_DEV && VIDEO_V4L2
@@ -207,4 +183,34 @@ config VIDEO_MX2_EMMAPRP
 
 endif # V4L_MEM2MEM_DRIVERS
 
+menuconfig V4L_TEST_DRIVERS
+        bool "Media test drivers"
+        depends on MEDIA_CAMERA_SUPPORT
+
+if V4L_TEST_DRIVERS
+config VIDEO_VIVI
+        tristate "Virtual Video Driver"
+        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
+        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
+        select FONT_8x16
+        select VIDEOBUF2_VMALLOC
+        default n
+        ---help---
+          Enables a virtual video driver. This device shows a color bar
+          and a timestamp, as a real device would generate by using V4L2
+          api.
+          Say Y here if you want to test video apps or debug V4L devices.
+          In doubt, say N.
+
+config VIDEO_MEM2MEM_TESTDEV
+        tristate "Virtual test device for mem2mem framework"
+        depends on VIDEO_DEV && VIDEO_V4L2
+        select VIDEOBUF2_VMALLOC
+        select V4L2_MEM2MEM_DEV
+        default n
+        ---help---
+          This is a virtual test device for the memory-to-memory driver
+          framework.
+endif #V4L_TEST_DRIVERS
+
 endif # MEDIA_CAMERA_SUPPORT