diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/media/davinci/isif.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'include/media/davinci/isif.h')
| -rw-r--r-- | include/media/davinci/isif.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/davinci/isif.h b/include/media/davinci/isif.h index b0b74ad618cc..7f3d76a4b9e3 100644 --- a/include/media/davinci/isif.h +++ b/include/media/davinci/isif.h | |||
| @@ -199,7 +199,7 @@ struct isif_black_clamp { | |||
| 199 | }; | 199 | }; |
| 200 | 200 | ||
| 201 | /************************************************************************* | 201 | /************************************************************************* |
| 202 | ** Color Space Convertion (CSC) | 202 | ** Color Space Conversion (CSC) |
| 203 | *************************************************************************/ | 203 | *************************************************************************/ |
| 204 | #define ISIF_CSC_NUM_COEFF 16 | 204 | #define ISIF_CSC_NUM_COEFF 16 |
| 205 | struct isif_color_space_conv { | 205 | struct isif_color_space_conv { |