author | Vishal Mahaveer <vishalm@ti.com> | |
Wed, 5 Mar 2014 16:23:06 +0000 (10:23 -0600) | ||
committer | Vishal Mahaveer <vishalm@ti.com> | |
Wed, 5 Mar 2014 16:23:06 +0000 (10:23 -0600) |
* 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video:
defconfig: enable LVDS sensor config in defconfig
Makefile: Rearrange devices in initialization sequence
defconfig: enable VPE/Deinterlacing module
Conflicts:
arch/arm/configs/android_omap_defconfig
Change-Id: Ibcbbfcf4aec038ccc2e396315eb20e15c15cf960
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
defconfig: enable LVDS sensor config in defconfig
Makefile: Rearrange devices in initialization sequence
defconfig: enable VPE/Deinterlacing module
Conflicts:
arch/arm/configs/android_omap_defconfig
Change-Id: Ibcbbfcf4aec038ccc2e396315eb20e15c15cf960
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/configs/android_omap_defconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/Makefile | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/configs/android_omap_defconfig
index 08e146ce6debe86924847547a299162d32b2e9aa,d218e9307f2f5fc6f3a8bec605d00d945f89e298..754075100e5614a07e76611ccf708487c4cd7d50
CONFIG_MEDIA_SUBDRV_AUTOSELECT=n
CONFIG_VIDEO_OV1063X=y
CONFIG_VIDEO_LOAD_KERNEL_VPDMA=y
+CONFIG_IVA_HIGH_OPP=y
+ CONFIG_V4L_MEM2MEM_DRIVERS=y
+ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
+ CONFIG_VIDEO_TI_VPE=y
+ CONFIG_VIDEO_TI_LVDS=y
diff --cc drivers/Makefile
Simple merge