diff options
author | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
commit | 6a7fe00e1f5a2e77b777b6e3b90c924c95bfa866 (patch) | |
tree | 1446c710e4a76d79fe11b1fa01ccb508f0d12d67 /drivers/media/platform/s5p-mfc/s5p_mfc_common.h | |
parent | ccf1801b089f5575144c4346e4d7d3883a6c9163 (diff) | |
parent | 8415e604452966f981f20cb4d8a8a30e38a772dd (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlinux-linaro-lsk-v3.10-androidlinux-linaro-lsk-android
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc_common.h')
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index ef4074cd531..f804c1faa7f 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h @@ -113,15 +113,6 @@ enum s5p_mfc_fmt_type { }; /** - * enum s5p_mfc_node_type - The type of an MFC device node. - */ -enum s5p_mfc_node_type { - MFCNODE_INVALID = -1, - MFCNODE_DECODER = 0, - MFCNODE_ENCODER = 1, -}; - -/** * enum s5p_mfc_inst_type - The type of an MFC instance. */ enum s5p_mfc_inst_type { |