projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_3.8-rc1' into v4l_for_linus
[deliverable/linux.git]
/
drivers
/
media
/
platform
/
s5p-mfc
/
s5p_mfc_opr_v6.c
diff --git
a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 50b5bee3c44e970070d4af07c0a6751c333d08e9..3a8cfd9fc1bd045e8fb05bd177b341c01e25595b 100644
(file)
--- a/
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@
-1762,7
+1762,7
@@
int s5p_mfc_get_dspl_y_adr_v6(struct s5p_mfc_dev *dev)
int s5p_mfc_get_dec_y_adr_v6(struct s5p_mfc_dev *dev)
{
- return mfc_read(dev, S5P_FIMV_D_D
ISPLAY
_LUMA_ADDR_V6);
+ return mfc_read(dev, S5P_FIMV_D_D
ECODED
_LUMA_ADDR_V6);
}
int s5p_mfc_get_dspl_status_v6(struct s5p_mfc_dev *dev)
This page took
0.026052 seconds
and
5
git commands to generate.