1 files changed, 6 insertions, 16 deletions

diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index 3c56037c82fc..ccfde4eb626a 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -97,25 +97,15 @@ config VIDEO_ISIF
            To compile this driver as a module, choose M here: the
            module will be called vpfe.
 
-config VIDEO_DM644X_VPBE
-        tristate "DM644X VPBE HW module"
-        depends on ARCH_DAVINCI_DM644x
+config VIDEO_DAVINCI_VPBE_DISPLAY
+        tristate "DM644X/DM365/DM355 VPBE HW module"
+        depends on ARCH_DAVINCI_DM644x || ARCH_DAVINCI_DM355 || ARCH_DAVINCI_DM365
         select VIDEO_VPSS_SYSTEM
         select VIDEOBUF2_DMA_CONTIG
         help
-            Enables VPBE modules used for display on a DM644x
-            SoC.
+            Enables Davinci VPBE module used for display devices.
+            This module is common for following DM644x/DM365/DM355
+            based display devices.
 
             To compile this driver as a module, choose M here: the
             module will be called vpbe.
-
-
-config VIDEO_VPBE_DISPLAY
-        tristate "VPBE V4L2 Display driver"
-        depends on ARCH_DAVINCI_DM644x
-        select VIDEO_DM644X_VPBE
-        help
-            Enables VPBE V4L2 Display driver on a DM644x device
-
-            To compile this driver as a module, choose M here: the
-            module will be called vpbe_display.