Merge branch 'afs-dh' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / drivers / staging / media / atomisp / pci / atomisp2 / css2400 / isp / kernels / raw / raw_1.0 / ia_css_raw.host.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
index 68a27f0cfba0845172c0c4ebb0e8d7d507d3425f..fa9ce0fedf234b3d03ef3ad0c4997493b441a99b 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
@@ -37,34 +37,34 @@ sh_css_elems_bytes_from_info (unsigned raw_bit_depth)
 
 /* MW: These areMIPI / ISYS properties, not camera function properties */
 static enum sh_stream_format
-css2isp_stream_format(enum ia_css_stream_format from)
+css2isp_stream_format(enum atomisp_input_format from)
 {
        switch (from) {
-       case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY:
+       case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
                return sh_stream_format_yuv420_legacy;
-       case IA_CSS_STREAM_FORMAT_YUV420_8:
-       case IA_CSS_STREAM_FORMAT_YUV420_10:
-       case IA_CSS_STREAM_FORMAT_YUV420_16:
+       case ATOMISP_INPUT_FORMAT_YUV420_8:
+       case ATOMISP_INPUT_FORMAT_YUV420_10:
+       case ATOMISP_INPUT_FORMAT_YUV420_16:
                return sh_stream_format_yuv420;
-       case IA_CSS_STREAM_FORMAT_YUV422_8:
-       case IA_CSS_STREAM_FORMAT_YUV422_10:
-       case IA_CSS_STREAM_FORMAT_YUV422_16:
+       case ATOMISP_INPUT_FORMAT_YUV422_8:
+       case ATOMISP_INPUT_FORMAT_YUV422_10:
+       case ATOMISP_INPUT_FORMAT_YUV422_16:
                return sh_stream_format_yuv422;
-       case IA_CSS_STREAM_FORMAT_RGB_444:
-       case IA_CSS_STREAM_FORMAT_RGB_555:
-       case IA_CSS_STREAM_FORMAT_RGB_565:
-       case IA_CSS_STREAM_FORMAT_RGB_666:
-       case IA_CSS_STREAM_FORMAT_RGB_888:
+       case ATOMISP_INPUT_FORMAT_RGB_444:
+       case ATOMISP_INPUT_FORMAT_RGB_555:
+       case ATOMISP_INPUT_FORMAT_RGB_565:
+       case ATOMISP_INPUT_FORMAT_RGB_666:
+       case ATOMISP_INPUT_FORMAT_RGB_888:
                return sh_stream_format_rgb;
-       case IA_CSS_STREAM_FORMAT_RAW_6:
-       case IA_CSS_STREAM_FORMAT_RAW_7:
-       case IA_CSS_STREAM_FORMAT_RAW_8:
-       case IA_CSS_STREAM_FORMAT_RAW_10:
-       case IA_CSS_STREAM_FORMAT_RAW_12:
-       case IA_CSS_STREAM_FORMAT_RAW_14:
-       case IA_CSS_STREAM_FORMAT_RAW_16:
+       case ATOMISP_INPUT_FORMAT_RAW_6:
+       case ATOMISP_INPUT_FORMAT_RAW_7:
+       case ATOMISP_INPUT_FORMAT_RAW_8:
+       case ATOMISP_INPUT_FORMAT_RAW_10:
+       case ATOMISP_INPUT_FORMAT_RAW_12:
+       case ATOMISP_INPUT_FORMAT_RAW_14:
+       case ATOMISP_INPUT_FORMAT_RAW_16:
                return sh_stream_format_raw;
-       case IA_CSS_STREAM_FORMAT_BINARY_8:
+       case ATOMISP_INPUT_FORMAT_BINARY_8:
        default:
                return sh_stream_format_raw;
        }