Merge branch 'linus' into core/rcu

Merge reason: Backmerge latest upstream to queue up dependent fix in the
              scheduler.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 14c77efd6a85..548bf1155c83 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -15,8 +15,9 @@
 #include <media/soc_camera.h>
 
 /* for flags */
-#define OV772X_FLAG_VFLIP     0x00000001 /* Vertical flip image */
-#define OV772X_FLAG_HFLIP     0x00000002 /* Horizontal flip image */
+#define OV772X_FLAG_VFLIP       (1 << 0) /* Vertical flip image */
+#define OV772X_FLAG_HFLIP       (1 << 1) /* Horizontal flip image */
+#define OV772X_FLAG_8BIT        (1 << 2) /* default 10 bit */
 
 /*
  * for Edge ctrl
@@ -53,9 +54,8 @@ struct ov772x_edge_ctrl {
  * ov772x camera info
  */
 struct ov772x_camera_info {
-        unsigned long          buswidth;
-        unsigned long          flags;
-        struct ov772x_edge_ctrl edgectrl;
+        unsigned long           flags;
+        struct ov772x_edge_ctrl edgectrl;
 };
 
 #endif /* __OV772X_H__ */