Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / include / video / imx-ipu-v3.h

diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index 73390c120cad03ec38030e68a4e5a1801d5fe668..85dedca3dcfb04e738764023b673a7ba3d47926d 100644 (file)
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -39,7 +39,7 @@ struct ipu_di_signal_cfg {
 
        struct videomode mode;
 
-       u32 pixel_fmt;
+       u32 bus_format;
        u32 v_to_h_sync;
 
 #define IPU_DI_CLKMODE_SYNC    (1 << 0)