From: Manjunath Hadli <manjunath.hadli@xxxxxx> add Kconfig and Makefile changes to build VPBE display driver on dm365 and dm355 along with dm644x. Signed-off-by: Manjunath Hadli <manjunath.hadli@xxxxxx> Signed-off-by: Lad, Prabhakar <prabhakar.lad@xxxxxx> --- drivers/media/video/davinci/Kconfig | 12 ++++++------ drivers/media/video/davinci/Makefile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/video/davinci/Kconfig b/drivers/media/video/davinci/Kconfig index 9337b56..7fd125d 100644 --- a/drivers/media/video/davinci/Kconfig +++ b/drivers/media/video/davinci/Kconfig @@ -93,13 +93,13 @@ 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 + tristate "DAVINCI VPBE HW module" + depends on ARCH_DAVINCI_DM644x || ARCH_DAVINCI_DM365 || ARCH_DAVINCI_DM355 select VIDEO_VPSS_SYSTEM select VIDEOBUF_DMA_CONTIG help - Enables VPBE modules used for display on a DM644x + Enables VPBE modules used for display on a DM644x, DM365, DM355 SoC. To compile this driver as a module, choose M here: the @@ -108,10 +108,10 @@ config VIDEO_DM644X_VPBE config VIDEO_VPBE_DISPLAY tristate "VPBE V4L2 Display driver" - depends on ARCH_DAVINCI_DM644x + depends on ARCH_DAVINCI_DM644x || ARCH_DAVINCI_DM365 || ARCH_DAVINCI_DM355 select VIDEO_DM644X_VPBE help - Enables VPBE V4L2 Display driver on a DM644x device + Enables VPBE V4L2 Display driver on a DM644x, DM365, DM355 device To compile this driver as a module, choose M here: the module will be called vpbe_display. diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile index ae7dafb..3057822 100644 --- a/drivers/media/video/davinci/Makefile +++ b/drivers/media/video/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_DAVINCI_VPBE) += vpbe.o vpbe_osd.o vpbe_venc.o obj-$(CONFIG_VIDEO_VPBE_DISPLAY) += vpbe_display.o -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html