diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-05-08 05:56:35 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 13:33:24 -0400 |
commit | d7a87e4cc39f7ee4f6d1a1a8b8fffc10a7b0c1e9 (patch) | |
tree | f159ed301587ba2f55ec02bda4dcce16f477bc26 /drivers/media/video/m5mols/m5mols.h | |
parent | 44b153ca639f7299a94c27fc48708bbbeccf5050 (diff) |
[media] m5mols: Add auto and preset white balance control
Replace the V4L2_CID_AUTO_WHITE_BALANCE control with its extended
version - V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE so the white balance
presets feature is exposed to user land.
Acked-by: HeungJun Kim <riverful.kim@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/m5mols/m5mols.h')
-rw-r--r-- | drivers/media/video/m5mols/m5mols.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/m5mols/m5mols.h b/drivers/media/video/m5mols/m5mols.h index 598bb0fe6036..fa1f2c145852 100644 --- a/drivers/media/video/m5mols/m5mols.h +++ b/drivers/media/video/m5mols/m5mols.h | |||
@@ -164,7 +164,7 @@ struct m5mols_version { | |||
164 | * @exposure: manual exposure control | 164 | * @exposure: manual exposure control |
165 | * @auto_iso: auto/manual ISO sensitivity control | 165 | * @auto_iso: auto/manual ISO sensitivity control |
166 | * @iso: manual ISO sensitivity control | 166 | * @iso: manual ISO sensitivity control |
167 | * @autowb: Auto White Balance control | 167 | * @auto_wb: auto white balance control |
168 | * @colorfx: color effect control | 168 | * @colorfx: color effect control |
169 | * @saturation: saturation control | 169 | * @saturation: saturation control |
170 | * @zoom: zoom control | 170 | * @zoom: zoom control |
@@ -200,8 +200,8 @@ struct m5mols_info { | |||
200 | struct v4l2_ctrl *auto_iso; | 200 | struct v4l2_ctrl *auto_iso; |
201 | struct v4l2_ctrl *iso; | 201 | struct v4l2_ctrl *iso; |
202 | }; | 202 | }; |
203 | |||
204 | struct v4l2_ctrl *auto_wb; | 203 | struct v4l2_ctrl *auto_wb; |
204 | |||
205 | struct v4l2_ctrl *colorfx; | 205 | struct v4l2_ctrl *colorfx; |
206 | struct v4l2_ctrl *saturation; | 206 | struct v4l2_ctrl *saturation; |
207 | struct v4l2_ctrl *zoom; | 207 | struct v4l2_ctrl *zoom; |