From 5be1fd2b481cf6026920fdcd14e37f82ec37871d Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Wed, 28 Nov 2012 10:58:47 -0300 Subject: [PATCH] --- yaml --- r: 357070 b: refs/heads/master c: cfe9dbd8a76835abd33ba92060817e2699524b1e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/davinci/Kconfig | 22 +++++-------------- trunk/drivers/media/platform/davinci/Makefile | 4 ++-- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 8d15950065ae..47a1bd80649d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caff80c35f923806b7e5ef312dce41663b5e99b9 +refs/heads/master: cfe9dbd8a76835abd33ba92060817e2699524b1e diff --git a/trunk/drivers/media/platform/davinci/Kconfig b/trunk/drivers/media/platform/davinci/Kconfig index 3c56037c82fc..ccfde4eb626a 100644 --- a/trunk/drivers/media/platform/davinci/Kconfig +++ b/trunk/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. diff --git a/trunk/drivers/media/platform/davinci/Makefile b/trunk/drivers/media/platform/davinci/Makefile index 74ed92d09257..f40f5219ca50 100644 --- a/trunk/drivers/media/platform/davinci/Makefile +++ b/trunk/drivers/media/platform/davinci/Makefile @@ -16,5 +16,5 @@ obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o obj-$(CONFIG_VIDEO_ISIF) += isif.o -obj-$(CONFIG_VIDEO_DM644X_VPBE) += vpbe.o vpbe_osd.o vpbe_venc.o -obj-$(CONFIG_VIDEO_VPBE_DISPLAY) += vpbe_display.o +obj-$(CONFIG_VIDEO_DAVINCI_VPBE_DISPLAY) += vpbe.o vpbe_osd.o \ + vpbe_venc.o vpbe_display.o