From a9d2ba1444b0af6c2d8534f0b306660ffc045bc6 Mon Sep 17 00:00:00 2001
From: Ian Wisbon <ian.wisbon@timesys.com>
Date: Thu, 10 Feb 2011 17:15:15 -0500
Subject: Linux 2.6.31 Release for Digi ConnectCore Wi-i.MX boards

---
 drivers/media/video/Kconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'drivers/media/video/Kconfig')

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index c64c8d201262..e7185d1cf281 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -592,6 +592,17 @@ config VIDEO_MXS_PXP
 	  To compile this driver as a module, choose M here: the
 	  module will be called pxp.
 
+config VIDEO_MXC_PXP_V4L2
+	tristate "MXC PxP V4L2 driver"
+	depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MX5
+	select VIDEOBUF_DMA_CONTIG
+	---help---
+	  This is a video4linux driver for the Freescale PxP
+	  (Pixel Pipeline). This module supports output overlay of
+	  the MXC framebuffer on a video stream.
+
+	  To compile this driver as a module, choose M here.
+
 config VIDEO_MXC_OPL
 	tristate
 	depends on VIDEO_DEV && ARCH_MXC
-- 
cgit v1.2.3