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/linux/msm_mdp.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/linux/msm_mdp.h')
| -rw-r--r-- | include/linux/msm_mdp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/msm_mdp.h b/include/linux/msm_mdp.h index d11fe0f2f956..fe722c1fb61d 100644 --- a/include/linux/msm_mdp.h +++ b/include/linux/msm_mdp.h | |||
| @@ -32,6 +32,7 @@ enum { | |||
| 32 | MDP_Y_CBCR_H2V1, /* Y and CrCb, pseduo planar w/ Cr is in MSB */ | 32 | MDP_Y_CBCR_H2V1, /* Y and CrCb, pseduo planar w/ Cr is in MSB */ |
| 33 | MDP_RGBA_8888, /* ARGB 888 */ | 33 | MDP_RGBA_8888, /* ARGB 888 */ |
| 34 | MDP_BGRA_8888, /* ABGR 888 */ | 34 | MDP_BGRA_8888, /* ABGR 888 */ |
| 35 | MDP_RGBX_8888, /* RGBX 888 */ | ||
| 35 | MDP_IMGTYPE_LIMIT /* Non valid image type after this enum */ | 36 | MDP_IMGTYPE_LIMIT /* Non valid image type after this enum */ |
| 36 | }; | 37 | }; |
| 37 | 38 | ||