diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/media/video/samsung/mfc5x/mfc_dec.h | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/media/video/samsung/mfc5x/mfc_dec.h')
| -rw-r--r-- | drivers/media/video/samsung/mfc5x/mfc_dec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/samsung/mfc5x/mfc_dec.h b/drivers/media/video/samsung/mfc5x/mfc_dec.h index f59795b..86b7a97 100644 --- a/drivers/media/video/samsung/mfc5x/mfc_dec.h +++ b/drivers/media/video/samsung/mfc5x/mfc_dec.h @@ -44,7 +44,12 @@ enum disp_status { DISP_S_DD = 1, DISP_S_DISPLAY = 2, DISP_S_FINISH = 3, +#ifndef CONFIG_SLP DISP_S_RES_CHANGE = 4, /* not H/W bit */ +#else + DISP_S_RES_CHANGING = 4, /* not H/W bit */ + DISP_S_RES_CHANGE_DONE = 5, /* not H/W bit */ +#endif }; /* decoding status */ |