Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / include / media / sh_mobile_csi2.h

diff --git a/include/media/sh_mobile_csi2.h b/include/media/sh_mobile_csi2.h
index 4d2615174461263e0d692ac1728abbda44bf7875..14030db51f131ab845277c3c1b879affbb67e9ff 100644 (file)
--- a/include/media/sh_mobile_csi2.h
+++ b/include/media/sh_mobile_csi2.h
@@ -11,6 +11,8 @@
 #ifndef SH_MIPI_CSI
 #define SH_MIPI_CSI
 
+#include <linux/list.h>
+
 enum sh_csi2_phy {
        SH_CSI2_PHY_MAIN,
        SH_CSI2_PHY_SUB,
@@ -31,8 +33,11 @@ struct sh_csi2_client_config {
        unsigned char lanes;            /* bitmask[3:0] */
        unsigned char channel;          /* 0..3 */
        struct platform_device *pdev;   /* client platform device */
+       const char *name;               /* async matching: client name */
 };
 
+struct v4l2_device;
+
 struct sh_csi2_pdata {
        enum sh_csi2_type type;
        unsigned int flags;
@@ -40,7 +45,4 @@ struct sh_csi2_pdata {
        int num_clients;
 };
 
-struct device;
-struct v4l2_device;
-
 #endif