diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/media/davinci/isif.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 { |