commit 7a1676edb438a6b5c829004c4746923c1e6bd7cb
author Linux Build Service Account <lnxbuild@localhost> Tue May 22 04:57:07 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue May 22 04:57:07 2012 -0700
tree 97b507b0ad709cc96194e7b832b5e7ea8dd11177
parent c548e4eea688c517ebf9aa2d891ac5650ea52ac2
parent a6b8db6c28d6db6409bba8397b28f4b89dfb74ac

Merge "msm: msm_vidc: enable msm_vidc driver compilation on 8x74." into msm-3.0

drivers/media/video/Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 5aaef24..7d53e11 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -1090,3 +1090,5 @@
 
 
 endif # V4L_MEM2MEM_DRIVERS
+
+source "drivers/media/video/msm_vidc/Kconfig"

drivers/media/video/Makefile

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 65a2348..444d3d4 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -189,6 +189,7 @@
 
 obj-$(CONFIG_MSM_CAMERA) += msm/
 obj-$(CONFIG_ARCH_OMAP)	+= omap/
+obj-$(CONFIG_MSM_VIDC) += msm_vidc/
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends

drivers/media/video/msm_vidc/Kconfig

diff --git a/drivers/media/video/msm_vidc/Kconfig b/drivers/media/video/msm_vidc/Kconfig
new file mode 100644
index 0000000..0b5a5fe
--- /dev/null
+++ b/drivers/media/video/msm_vidc/Kconfig
@@ -0,0 +1,8 @@
+#
+# VIDEO CORE
+#
+
+menuconfig MSM_VIDC
+	bool "Qualcomm MSM Video Core Driver"
+		depends on ARCH_MSMCOPPER && VIDEO_V4L2
+		default y

drivers/media/video/msm_vidc/Makefile

diff --git a/drivers/media/video/msm_vidc/Makefile b/drivers/media/video/msm_vidc/Makefile
new file mode 100644
index 0000000..12c61c9
--- /dev/null
+++ b/drivers/media/video/msm_vidc/Makefile
@@ -0,0 +1,8 @@
+obj-$(CONFIG_MSM_VIDC) := 	msm_v4l2_vidc.o \
+				msm_vidc_common.o \
+				msm_vidc.o \
+				msm_vdec.o \
+				msm_venc.o \
+				msm_smem.o \
+				vidc_hal.o \
+				vidc_hal_interrupt_handler.o \