projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant
[linux-2.6-block.git]
/
drivers
/
media
/
video
/
s5p-mfc
/
s5p_mfc_shm.h
diff --git
a/drivers/media/video/s5p-mfc/s5p_mfc_shm.h
b/drivers/media/video/s5p-mfc/s5p_mfc_shm.h
index 764eac6bcc4c91d732880b31f024389f03fde692..cf962a4662766db5b1888f01c7e910fe245447c6 100644
(file)
--- a/
drivers/media/video/s5p-mfc/s5p_mfc_shm.h
+++ b/
drivers/media/video/s5p-mfc/s5p_mfc_shm.h
@@
-13,8
+13,7
@@
#ifndef S5P_MFC_SHM_H_
#define S5P_MFC_SHM_H_
-enum MFC_SHM_OFS
-{
+enum MFC_SHM_OFS {
EXTENEDED_DECODE_STATUS = 0x00, /* D */
SET_FRAME_TAG = 0x04, /* D */
GET_FRAME_TAG_TOP = 0x08, /* D */