diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /include/media/v4l2-int-device.h | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'include/media/v4l2-int-device.h')
| -rw-r--r-- | include/media/v4l2-int-device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h index ecda3c725837..fbf585561570 100644 --- a/include/media/v4l2-int-device.h +++ b/include/media/v4l2-int-device.h | |||
| @@ -219,7 +219,7 @@ enum v4l2_int_ioctl_num { | |||
| 219 | vidioc_int_reset_num, | 219 | vidioc_int_reset_num, |
| 220 | /* VIDIOC_INT_INIT */ | 220 | /* VIDIOC_INT_INIT */ |
| 221 | vidioc_int_init_num, | 221 | vidioc_int_init_num, |
| 222 | /* VIDIOC_INT_G_CHIP_IDENT */ | 222 | /* VIDIOC_DBG_G_CHIP_IDENT */ |
| 223 | vidioc_int_g_chip_ident_num, | 223 | vidioc_int_g_chip_ident_num, |
| 224 | 224 | ||
| 225 | /* | 225 | /* |