V4L/DVB(10738a): remove include/linux/video_encoder.h

include/linux/video_encoder.h is not used anymore by a v4l driver.
Let's remove it and its occurences.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index f1d6399..3a311fe 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -125,7 +125,6 @@ Code        Seq#    Include File            Comments
 'd'    00-DF   linux/video_decoder.h   conflict!
 'd'    F0-FF   linux/digi1.h
 'e'    all     linux/digi1.h           conflict!
-'e'    00-1F   linux/video_encoder.h   conflict!
 'e'    00-1F   net/irda/irtty.h        conflict!
 'f'    00-1F   linux/ext2_fs.h
 'h'    00-7F                           Charon filesystem

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index e9581fd..da7ff0b 100644 (file)
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -159,7 +159,6 @@ header-y += un.h
 header-y += utime.h
 header-y += veth.h
 header-y += video_decoder.h
-header-y += video_encoder.h
 header-y += videotext.h
 header-y += x25.h
 

diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h
deleted file mode 100644 (file)
index b7b6423..0000000
--- a/include/linux/video_encoder.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _LINUX_VIDEO_ENCODER_H
-#define _LINUX_VIDEO_ENCODER_H
-
-#include <linux/types.h>
-
-struct video_encoder_capability { /* this name is too long */
-       __u32   flags;
-#define        VIDEO_ENCODER_PAL       1       /* can encode PAL signal */
-#define        VIDEO_ENCODER_NTSC      2       /* can encode NTSC */
-#define        VIDEO_ENCODER_SECAM     4       /* can encode SECAM */
-#define        VIDEO_ENCODER_CCIR      16      /* CCIR-601 pixel rate (720 pixels per line) instead of square pixel rate */
-       int     inputs;                 /* number of inputs */
-       int     outputs;                /* number of outputs */
-};
-
-#define        ENCODER_GET_CAPABILITIES _IOR('e', 1, struct video_encoder_capability)
-#define        ENCODER_SET_NORM        _IOW('e', 2, int)
-#define        ENCODER_SET_INPUT       _IOW('e', 3, int)       /* 0 <= input < #inputs */
-#define        ENCODER_SET_OUTPUT      _IOW('e', 4, int)       /* 0 <= output < #outputs */
-#define        ENCODER_ENABLE_OUTPUT   _IOW('e', 5, int)       /* boolean output enable control */
-
-
-#endif