From: Yusuf Caglar Akyuz <cag...@bilkon-kontrol.com.tr>
Signed-off-by: Yusuf Caglar Akyuz <cag...@bilkon-kontrol.com.tr>
---
drivers/media/video/Kconfig | 20 ++++++++++++++++++++
drivers/media/video/Makefile | 3 +++
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 9d48da2..067dfac 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -479,6 +479,26 @@ config VIDEO_VIVI
Say Y here if you want to test video apps or debug V4L devices.
In doubt, say N.
+config DAVINCI_OSD
+ tristate "Davinci Display Manager"
+ depends on ARCH_DAVINCI
+ default n
+ help
+ Support for Davinci On-Screen Display Manager.
+
+ To compile this driver as a module, choose M here: the
+ module will be called vpif.
+
+config DAVINCI_VPBE_ENCODER
+ tristate "Davinci VPBE Encoder support"
+ depends on ARCH_DAVINCI
+ default n
+ help
+ Enable support for the DaVinci VPBE internal encoder. DaVinci VPBE
+ has internal VENC and DAC to output analog SD outputs (composite,
+ S-Video and Component video outputs).
+
+
source "drivers/media/video/bt8xx/Kconfig"
config VIDEO_PMS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 3f1a035..c0d1034 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -152,6 +152,9 @@ obj-$(CONFIG_VIDEO_AU0828) += au0828/
obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
+obj-$(CONFIG_DAVINCI_OSD) += davinci/davinci_platform.o
davinci/davinci_osd.o davinci/davinci_enc_mngr.o
+obj-$(CONFIG_DAVINCI_VPBE_ENCODER) += davinci/vpbe_encoder.o
+
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
EXTRA_CFLAGS += -Idrivers/media/common/tuners
--
1.5.6
_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
