can: bcm: fix warning in bcm_connect/proc_register

[pandora-kernel.git] / include / media / ov772x.h

diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 548bf11..00dbb7c 100644 (file)
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -12,12 +12,9 @@
 #ifndef __OV772X_H__
 #define __OV772X_H__
 
-#include <media/soc_camera.h>
-
 /* for flags */
 #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
@@ -32,22 +29,23 @@ struct ov772x_edge_ctrl {
        unsigned char lower;
 };
 
-#define OV772X_MANUAL_EDGE_CTRL        0x80 /* un-used bit of strength */
-#define EDGE_STRENGTH_MASK     0x1F
-#define EDGE_THRESHOLD_MASK    0x0F
-#define EDGE_UPPER_MASK                0xFF
-#define EDGE_LOWER_MASK                0xFF
+#define OV772X_MANUAL_EDGE_CTRL                0x80 /* un-used bit of strength */
+#define OV772X_EDGE_STRENGTH_MASK      0x1F
+#define OV772X_EDGE_THRESHOLD_MASK     0x0F
+#define OV772X_EDGE_UPPER_MASK         0xFF
+#define OV772X_EDGE_LOWER_MASK         0xFF
 
 #define OV772X_AUTO_EDGECTRL(u, l)     \
 {                                      \
-       .upper = (u & EDGE_UPPER_MASK), \
-       .lower = (l & EDGE_LOWER_MASK), \
+       .upper = (u & OV772X_EDGE_UPPER_MASK),  \
+       .lower = (l & OV772X_EDGE_LOWER_MASK),  \
 }
 
-#define OV772X_MANUAL_EDGECTRL(s, t)                                   \
-{                                                                      \
-       .strength  = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\
-       .threshold = (t & EDGE_THRESHOLD_MASK),                         \
+#define OV772X_MANUAL_EDGECTRL(s, t)                   \
+{                                                      \
+       .strength  = (s & OV772X_EDGE_STRENGTH_MASK) |  \
+                       OV772X_MANUAL_EDGE_CTRL,        \
+       .threshold = (t & OV772X_EDGE_THRESHOLD_MASK),  \
 }
 
 /*