diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-09 21:16:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:11 -0400 |
commit | bd894b590ef45297c941b7af0e8de13a2fd306d6 (patch) | |
tree | 871064f6f9a575c80c2cef5ca73f800a709bfc9d /drivers/media/video/v4l2-ioctl.c | |
parent | a99e30d70bcb83bdd097945df282199ead9c9a4b (diff) |
V4L/DVB (10870): v4l2-ioctl: get rid of video_decoder.h
The V4L1 obsoleted header video_decoder.h is not used anymore by any driver. Only
a name decoding function at v4l2-ioctl still implements it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
-rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index efbc47004657..6a7955547474 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <media/v4l2-common.h> | 25 | #include <media/v4l2-common.h> |
26 | #include <media/v4l2-ioctl.h> | 26 | #include <media/v4l2-ioctl.h> |
27 | #include <media/v4l2-chip-ident.h> | 27 | #include <media/v4l2-chip-ident.h> |
28 | #include <linux/video_decoder.h> | ||
29 | 28 | ||
30 | #define dbgarg(cmd, fmt, arg...) \ | 29 | #define dbgarg(cmd, fmt, arg...) \ |
31 | do { \ | 30 | do { \ |
@@ -276,19 +275,6 @@ static const char *v4l2_ioctls[] = { | |||
276 | #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) | 275 | #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) |
277 | 276 | ||
278 | static const char *v4l2_int_ioctls[] = { | 277 | static const char *v4l2_int_ioctls[] = { |
279 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | ||
280 | [_IOC_NR(DECODER_GET_CAPABILITIES)] = "DECODER_GET_CAPABILITIES", | ||
281 | [_IOC_NR(DECODER_GET_STATUS)] = "DECODER_GET_STATUS", | ||
282 | [_IOC_NR(DECODER_SET_NORM)] = "DECODER_SET_NORM", | ||
283 | [_IOC_NR(DECODER_SET_INPUT)] = "DECODER_SET_INPUT", | ||
284 | [_IOC_NR(DECODER_SET_OUTPUT)] = "DECODER_SET_OUTPUT", | ||
285 | [_IOC_NR(DECODER_ENABLE_OUTPUT)] = "DECODER_ENABLE_OUTPUT", | ||
286 | [_IOC_NR(DECODER_SET_PICTURE)] = "DECODER_SET_PICTURE", | ||
287 | [_IOC_NR(DECODER_SET_GPIO)] = "DECODER_SET_GPIO", | ||
288 | [_IOC_NR(DECODER_INIT)] = "DECODER_INIT", | ||
289 | [_IOC_NR(DECODER_SET_VBI_BYPASS)] = "DECODER_SET_VBI_BYPASS", | ||
290 | [_IOC_NR(DECODER_DUMP)] = "DECODER_DUMP", | ||
291 | #endif | ||
292 | [_IOC_NR(AUDC_SET_RADIO)] = "AUDC_SET_RADIO", | 278 | [_IOC_NR(AUDC_SET_RADIO)] = "AUDC_SET_RADIO", |
293 | 279 | ||
294 | [_IOC_NR(TUNER_SET_TYPE_ADDR)] = "TUNER_SET_TYPE_ADDR", | 280 | [_IOC_NR(TUNER_SET_TYPE_ADDR)] = "TUNER_SET_TYPE_ADDR", |