X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fmeye.h;h=12010ace1f04abd1d556cdb3b9e4935a0d697af7;hb=8b0a88d5912ab549d5adac2c8498ecdaae5319a5;hp=39fd9c8ddd4b27b2adcf14659e5b4477a3ba8194;hpb=d84c4124c4b6611301b402e8611b7e36de3bd351;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/meye.h b/include/linux/meye.h
index 39fd9c8ddd4..12010ace1f0 100644
--- a/include/linux/meye.h
+++ b/include/linux/meye.h
@@ -58,7 +58,7 @@ struct meye_params {
 
 /* V4L2 private controls */
 #define V4L2_CID_AGC		V4L2_CID_PRIVATE_BASE
-#define V4L2_CID_SHARPNESS	(V4L2_CID_PRIVATE_BASE + 1)
+#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)