diff options
author | Liu Ying <Ying.Liu@freescale.com> | 2013-08-05 03:47:22 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:01:04 -0400 |
commit | 57069a5dd4f48dbf88caf9c959a4353db5301032 (patch) | |
tree | 268447a1bb3ad843a43bc88d72084057b4fde8fa /include/uapi/linux/Kbuild | |
parent | 7cf40c09dd83a769823e1339a83148fe8efdcb25 (diff) |
ENGR00273974-1 media: port mxc vout driver from 3.5.7 to 3.10
This is porting mxc vout driver from imx_3.5.7 kernel to
imx_3.10 kernel.
* Put the driver in drivers/media/platform/ directory instead
of drivers/media/video/ directory, since the later one is
renamed to the former one in 3.10 kernel.
* Change the ipu-v3.h header file from <mach/ipu-v3.h> to
<linux/ipu-v3.h>.
* Change the mxc_vidioc_s_crop() function's implementation since
the definition of the vidioc_s_crop() function is modified to
make the last argument be constant.
* Set vfl_dir to be VFL_DIR_TX since the ioctrl validity checks
are improved in 3.10 kernel.
* Remove 'defaut y' setting for VIDEO_MXC_OUTPUT and
VIDEO_MXC_IPU_OUTPUT Kconfigs. They may be configured by kernel
default configure or by user.
* Make VIDEO_MXC_OUTPUT Kconfig depend on FB_MXC Kconfig since
we need framebuffers to be rendered.
* Make VIDEO_MXC_IPU_OUTPUT Kconfig be tristate.
* Split <linux/mxc_v4l2.h> header file up into include/linux/
and include/uapi/linux/ directories so that the userspace may
include the mxc_v4l2.h header file.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
Diffstat (limited to 'include/uapi/linux/Kbuild')
-rw-r--r-- | include/uapi/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index a19cdb19899d..9c9eb267483c 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild | |||
@@ -251,6 +251,7 @@ header-y += msdos_fs.h | |||
251 | header-y += msg.h | 251 | header-y += msg.h |
252 | header-y += mtio.h | 252 | header-y += mtio.h |
253 | header-y += mxcfb.h | 253 | header-y += mxcfb.h |
254 | header-y += mxc_v4l2.h | ||
254 | header-y += n_r3964.h | 255 | header-y += n_r3964.h |
255 | header-y += nbd.h | 256 | header-y += nbd.h |
256 | header-y += ncp.h | 257 | header-y += ncp.h |