summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBrandon Philips <brandon@ifup.org>2008-04-22 19:42:06 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 19:07:43 +0200
commite723ee00893f242cbccf5ef2faffdaa6afb8f244 (patch)
tree6876b42567937b55559fdd68c97eaf68c5017b8f /include
parentV4L/DVB (7196): Lift videobuf-dma-sg's PCI dependency, until it is fixed (diff)
downloadlinux-e723ee00893f242cbccf5ef2faffdaa6afb8f244.tar.xz
linux-e723ee00893f242cbccf5ef2faffdaa6afb8f244.zip
V4L/DVB (7204): remove V4L2_CID_SHARPNESS from meye.h and report private control as DISABLED
- Continue to support the V4L2_CID_PRIVATE_BASE + 1 control in the ABI - Report the same control as V4L2_CID_SHARPNESS - Report the private control disabled via QUERYCTRL Signed-off-by: Brandon Philips <bphilips@suse.de> Acked-by: Stelian Pop <stelian@popies.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/meye.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/meye.h b/include/linux/meye.h
index 39fd9c8ddd4b..12010ace1f04 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)