Merge remote-tracking branch 'mac80211/master' into HEAD

[firefly-linux-kernel-4.4.55.git] / include / uapi / linux / meye.h

diff --git a/include/uapi/linux/meye.h b/include/uapi/linux/meye.h
index 0dd49954f7467070f80ffd98b6bed23405275df0..8ff50fe9e4812e9947935b7efade1933db2427a6 100644 (file)
--- a/include/uapi/linux/meye.h
+++ b/include/uapi/linux/meye.h
@@ -57,10 +57,8 @@ struct meye_params {
 #define MEYEIOC_STILLJCAPT     _IOR ('v', BASE_VIDIOC_PRIVATE+5, int)
 
 /* V4L2 private controls */
-#define V4L2_CID_AGC           V4L2_CID_PRIVATE_BASE
-#define V4L2_CID_MEYE_SHARPNESS        (V4L2_CID_PRIVATE_BASE + 1)
-#define V4L2_CID_PICTURE       (V4L2_CID_PRIVATE_BASE + 2)
-#define V4L2_CID_JPEGQUAL      (V4L2_CID_PRIVATE_BASE + 3)
-#define V4L2_CID_FRAMERATE     (V4L2_CID_PRIVATE_BASE + 4)
+#define V4L2_CID_MEYE_AGC              (V4L2_CID_USER_MEYE_BASE + 0)
+#define V4L2_CID_MEYE_PICTURE          (V4L2_CID_USER_MEYE_BASE + 1)
+#define V4L2_CID_MEYE_FRAMERATE                (V4L2_CID_USER_MEYE_BASE + 2)
 
 #endif