diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 10:17:59 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 10:17:59 -0200 |
commit | 3f85abb813f1ad7454fb7a2f8e2998373571fe39 (patch) | |
tree | cf89a87206ea42719ee69f209d43a704034b2c22 /linux/include/media/v4l2-int-device.h | |
parent | b0ab681e920adac28d099cb1ec192d2ada2c160f (diff) | |
parent | b50e38700408ec0bb073fc56ade123a1305842b6 (diff) | |
download | mediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.gz mediapointer-dvb-s2-3f85abb813f1ad7454fb7a2f8e2998373571fe39.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/v4l2-int-device.h')
-rw-r--r-- | linux/include/media/v4l2-int-device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-int-device.h b/linux/include/media/v4l2-int-device.h index ecda3c725..fbf585561 100644 --- a/linux/include/media/v4l2-int-device.h +++ b/linux/include/media/v4l2-int-device.h @@ -219,7 +219,7 @@ enum v4l2_int_ioctl_num { vidioc_int_reset_num, /* VIDIOC_INT_INIT */ vidioc_int_init_num, - /* VIDIOC_INT_G_CHIP_IDENT */ + /* VIDIOC_DBG_G_CHIP_IDENT */ vidioc_int_g_chip_ident_num, /* |