diff options
| author | Jeff Kudrick <jeff.kudrick@freescale.com> | 2012-03-10 01:58:35 -0600 |
|---|---|---|
| committer | Jeff Kudrick <jeff.kudrick@freescale.com> | 2012-03-10 01:58:35 -0600 |
| commit | d77c8e89f64c328ebefbcc12a047010c679baac3 (patch) | |
| tree | 23ef6c8bb2c95bf51984114346279418f595ff84 /include | |
| parent | 7e9616f28995cd1ad36dc23c89d15d361f1e47a8 (diff) | |
ENGR00175622: Android Kernel alignment for ICS Camera
Alignment to latest changes in Linux 3.0 kernel to Linux 2.6.38
support for iMX53 ICS.
Signed-off-by: Jeff Kudrick <jeff.kudrick@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mxc_v4l2.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/mxc_v4l2.h b/include/linux/mxc_v4l2.h index e83e5923c2a4..95bff118557e 100644 --- a/include/linux/mxc_v4l2.h +++ b/include/linux/mxc_v4l2.h @@ -1,5 +1,5 @@ /* - * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2012 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -29,7 +29,8 @@ #define V4L2_CID_MXC_ROT (V4L2_CID_PRIVATE_BASE + 0) #define V4L2_CID_MXC_FLASH (V4L2_CID_PRIVATE_BASE + 1) #define V4L2_CID_MXC_VF_ROT (V4L2_CID_PRIVATE_BASE + 2) -#define V4L2_CID_MXC_MOTION (V4L2_CID_PRIVATE_BASE + 3) +#define V4L2_CID_MXC_MOTION (V4L2_CID_PRIVATE_BASE + 3) +#define V4L2_CID_MXC_SWITCH_CAM (V4L2_CID_PRIVATE_BASE + 6) #define V4L2_MXC_ROTATE_NONE 0 #define V4L2_MXC_ROTATE_VERT_FLIP 1 |