summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/v4l2-common.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
commitadff0f37dc0f0ab48850eaad267223c634e975a2 (patch)
treec6aa3e259581abeb64eb7590b29a60354ec5a5ee /linux/drivers/media/video/v4l2-common.c
parente2b4212172d81f17f5e4741766f032d06e83ce4f (diff)
parentf25ebd42bbb82866dfbbba5b7bfc651315fa6416 (diff)
downloadmediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.gz
mediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.bz2
merge: http://linuxtv.org/hg/~tap/bttv
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-common.c')
-rw-r--r--linux/drivers/media/video/v4l2-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c
index 6cc7d4058..8ae8dd366 100644
--- a/linux/drivers/media/video/v4l2-common.c
+++ b/linux/drivers/media/video/v4l2-common.c
@@ -750,7 +750,7 @@ EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid_items);
/* ctrl_classes points to an array of u32 pointers, the last element is
a NULL pointer. Each u32 array is a 0-terminated array of control IDs.
Each array must be sorted low to high and belong to the same control
- class. The array of u32 pointer must also be sorted, from low class IDs
+ class. The array of u32 pointers must also be sorted, from low class IDs
to high class IDs.
This function returns the first ID that follows after the given ID.